X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=CHANGELOG;h=2362383c3b25c1e4606d1a74639f3b4a9af34eaa;hp=2c295eae2486425e5585d3997fa80efbbcecf99b;hb=f537f1037e07b2a4be1681d158e17cc62683cbfa;hpb=2da1b7c395cd33f03bbb93919c88a4d0fb2de1ed

diff --git a/CHANGELOG b/CHANGELOG
index 2c295ea..2362383 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,12 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+<<<<<<< 1.43
+=======
 --- XXXXXXXXXXXXX
 
 Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
 
+>>>>>>> /tmp/T4a00109
 --- 1.2 1996/6/10 (1st anniversary release)
 
 Added Summary record syntax. Lightly tested.