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

diff --git a/CHANGELOG b/CHANGELOG
index 2362383..cb3cd88 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,11 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
-<<<<<<< 1.43
-=======
 --- XXXXXXXXXXXXX
 
 Fixed tagging bug in ResourceReportResponse PDU encoder/decode.
 
->>>>>>> /tmp/T4a00109
+Added SOIF syntax (using private OID for now) to retrieval module and client.
+
 --- 1.2 1996/6/10 (1st anniversary release)
 
 Added Summary record syntax. Lightly tested.