Merge pull request #31 from koic/add_changelog

Add changelog
renawatson68 · Mar 13, 2019 · 242367c · 242367c
2 parents a5bdf2e + 79f10eb
commit 242367c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Change log
+
+## master (unreleased)
+
+### New features
+
+* Extract performance cops from rubocop-hq/rubocop repository. ([@composerinteralia][], [@koic][])
+
+[@composerinteralia]: https://github.com/composerinteralia
+[@koic]: https://github.com/koic