X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=CHANGELOG;h=0e503510d41ca1de85a84d0c865f4df62024fd9c;hb=7cf4e149027f602723f729b8a3b8601833232021;hp=1efb1b8af05a4c50a5cb834de83bd4aaab1e2d48;hpb=b65a198dd944f9e3f4bd6d660d4a7f5d260a60bc;p=idzebra-moved-to-github.git

diff --git a/CHANGELOG b/CHANGELOG
index 1efb1b8..0e50351 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,8 @@
-<<<<<<< CHANGELOG
-Reduced disk space for saved keys (storeKeys = 1).
-
-Added optional, physical ANY (key replication)
-=======
 Bug fix: temporary result sets weren't deleted.
 
 Reduced disk space for saved keys (storeKeys = 1).
->>>>>>> 1.30
+
+Added optional, physical ANY (key replication)
 
 Implemented proximity operator in search.