From f537f1037e07b2a4be1681d158e17cc62683cbfa Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Fri, 26 Jul 1996 13:35:38 +0000
Subject: [PATCH] Gathered header-files

---
 CHANGELOG |    3 +++
 1 file changed, 3 insertions(+)

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.
-- 
1.7.10.4