1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a3fca075..407d0617 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,5 @@
 ---------------------------------------------------------------------------
 Version 5.3.2  [DEVEL] (rgerhards), 2009-10-??
-<<<<<<< HEAD:ChangeLog
 - enhanced omfile to support transactional interface. This will increase
   performance in many cases.
 - added multi-ruleset support to imudp