From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 2 Jan 1997 12:05:01 +0000 (+0000)
Subject: Merge.
X-Git-Tag: ZEBRA.1.0~351
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=7cf4e149027f602723f729b8a3b8601833232021

Merge.
---

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.