From 7f9eb50b2c689e83697d4d8ff48f12f7b3a02d35 Mon Sep 17 00:00:00 2001
From: Daniel Tschinder <daniel.tschinder@researchgate.net>
Date: Wed, 10 May 2017 18:40:12 +0200
Subject: [PATCH] Fix changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd907247d6..1e2bbac604 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -145,8 +145,6 @@ Need to modify Babel for this AST node change, so moving to 7.0.
 
 [react-native](https://github.com/facebook/react-native/issues/12542) broke with this so we reverted.
 
-=======
->>>>>>> 6.x
 ## 6.16.0 (2017-02-23)
 
 ### :rocket: New Feature