From: John (J5) Palmieri <johnp@redhat.com>
Date: Wed, 15 Feb 2006 21:44:11 +0000 (+0000)
Subject: * remove line from ChangeLog which was an artifact of an update conflict
X-Git-Tag: dbus-0.61~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08bbc0210c243cb1c7e41d0c434fc069c7b2743c;p=thirdparty%2Fdbus.git

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

diff --git a/ChangeLog b/ChangeLog
index 5055ea5ee..b2fcef218 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