[sawfish] removed left-over merge conflict bit in ChangeLog

[Christopher Bratusek <chrisb src gnome org>]

commit 921bf5e9e89ed953c8939919812b0e4dbb263c3f
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sat Dec 12 10:35:00 2009 +0100

    removed left-over merge conflict bit in ChangeLog

 ChangeLog |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bf757f8..d0610bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 2009-12-12  Christopher Bratusek <zanghar freenet de>
 	* README.IMPORTANT: updated