From d03577c344115e0f66b19bf1b05c8e7bb6d51fe3 Mon Sep 17 00:00:00 2001
From: Ben Mosher <me@benmosher.com>
Date: Mon, 12 Sep 2016 16:39:26 -0400
Subject: [PATCH] need to get my act together. fortunately, @jfmengels is on it

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c81cd896b..3522dda4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -299,11 +299,8 @@ for info on changes for earlier releases.
 [`no-mutable-exports`]: ./docs/rules/no-mutable-exports.md
 [`prefer-default-export`]: ./docs/rules/prefer-default-export.md
 [`no-restricted-paths`]: ./docs/rules/no-restricted-paths.md
-<<<<<<< HEAD
 [`no-absolute-path`]: ./docs/rules/no-absolute-path.md
-=======
 [`max-dependencies`]: ./docs/rules/max-dependencies.md
->>>>>>> tizmagik/feature/max-dependencies
 
 [#538]: https://github.com/benmosher/eslint-plugin-import/pull/538
 [#527]: https://github.com/benmosher/eslint-plugin-import/pull/527