Gathered header-files

diff --git a/CHANGELOG b/CHANGELOG
index 2c295ea..2362383 100644 (file)
--- 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.