Fix changelog

Signed-off-by: Aniket Pant <me@aniketpant.com>
This commit is contained in:
Aniket Pant 2013-06-26 11:20:58 +05:30
parent 5e448270d2
commit 9e969786f5

View file

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