From: Sebastian Hammer <quinn@indexdata.com>
Date: Thu, 6 Jun 1996 12:08:53 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ZEBRA.1.0~426
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=70d1a2d88311930a7a8d4b249d5894ec30204100;p=idzebra-moved-to-github.git

*** empty log message ***
---

diff --git a/CHANGELOG b/CHANGELOG
index ee72b28..8acf5f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
-<<<<<<< CHANGELOG
+--- XXXXXXXXXXXXXX
+
+Added character-conversion subsystem.
+
 --- 1.0a7 1997/5/16
 
 Fixed buffer-size problem in indexing.
@@ -9,11 +12,8 @@ Added phrase registers.
 
 Added dynamic mapping of search attribute to multiple termlists (ANY).
 
-||||||| 1.18
-=======
 Scan support in multiple databases/registers.
 
->>>>>>> /tmp/T4a11432
 Configuration settings are case-insensitive and single dash (-)
 characters are ignored in comparisons.