X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=CHANGELOG;h=2362383c3b25c1e4606d1a74639f3b4a9af34eaa;hp=98212d26251e16cf516688ca61c4a3c24dba0290;hb=52463063061a631f9cb086e938bc4494efec0bb5;hpb=fd4b371b704caa2b56210b4ca386cfdfd5da7089

diff --git a/CHANGELOG b/CHANGELOG
index 98212d2..2362383 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
---- 1.2 1996/6/x (1st anniversary release)
+<<<<<<< 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.