*** empty log message ***

diff --git a/CHANGELOG b/CHANGELOG
index ee72b28..8acf5f5 100644 (file)
--- 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.