Skip to content

Commit

Permalink
changelog merge fail, thanks @rhys-vdw for the heads up
Browse files Browse the repository at this point in the history
  • Loading branch information
@benmosher
benmosher committed Jul 27, 2016
1 parent e07223c commit 04ded19
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,11 +311,8 @@ for info on changes for earlier releases.
[#157]: https://github.com/benmosher/eslint-plugin-import/pull/157
[#314]: https://github.com/benmosher/eslint-plugin-import/pull/314

<<<<<<< 30e55b65d6a8a08585aa72c51f8e5871d9a832a6
[#453]: https://github.com/benmosher/eslint-plugin-import/issues/453
=======
[#456]: https://github.com/benmosher/eslint-plugin-import/issues/456
>>>>>>> add `allowComputed` option to `namespace` (fixes #456)
[#453]: https://github.com/benmosher/eslint-plugin-import/issues/453
[#441]: https://github.com/benmosher/eslint-plugin-import/issues/441
[#423]: https://github.com/benmosher/eslint-plugin-import/issues/423
[#415]: https://github.com/benmosher/eslint-plugin-import/issues/415
Expand Down

0 comments on commit 04ded19

Please sign in to comment.