From 08bbc0210c243cb1c7e41d0c434fc069c7b2743c Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@redhat.com>
Date: Wed, 15 Feb 2006 21:44:11 +0000
Subject: * remove line from ChangeLog which was an artifact of an update
 conflict

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5055ea5e..b2fcef21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,7 +27,6 @@
 	but it's now possible to store these in arrays, emit them in
 	signals, etc.
 
->>>>>>> 1.959
 2006-02-10  John (J5) Palmieri  <johnp@redhat.com>
 
 	* dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly
-- 
cgit