* remove line from ChangeLog which was an artifact of an update conflict

diff --git a/ChangeLog b/ChangeLog
index 5055ea5eec23400abf82e394ef418516aa8b73cc..b2fcef21805830ec8f75da17c6a9ee033c898dda 100644 (file)
--- 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