From d91165c9465ff1ca725bdb6e37f4bd75c3398c0d Mon Sep 17 00:00:00 2001
From: Aniket Pant <me@aniketpant.com>
Date: Wed, 26 Jun 2013 11:20:58 +0530
Subject: [PATCH] Fix changelog

Signed-off-by: Aniket Pant <me@aniketpant.com>
---
 CHANGELOG.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a4ca086..1d83cc4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,16 +3,11 @@ Changelog
 
 #### 1.1.1
 
-<<<<<<< HEAD
 * [New] Export to multiple files
 * [New] Feature to export to given output file
-
-#### 1.1.0
-=======
 * [Fixed] Unicode and Python3 issues resolved.
 
 ### 1.1.0
->>>>>>> master
 
 * [New] JSON export exports tags as well.
 * [Improved] Nicer error message when there is a syntactical error in your config file.