Added optional, physical ANY

[idzebra-moved-to-github.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 8107a0a..1efb1b8 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
+<<<<<<< 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
 
 Implemented proximity operator in search.