dbus ChangeLog,1.960,1.961

[John Palmieri]

Update of /cvs/dbus/dbus
In directory gabe:/tmp/cvs-serv29058

Modified Files:
	ChangeLog 
Log Message:
* remove line from ChangeLog which was an artifact of an update conflict


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.960
retrieving revision 1.961
diff -u -d -r1.960 -r1.961
--- ChangeLog	15 Feb 2006 21:42:54 -0000	1.960
+++ ChangeLog	15 Feb 2006 21:44:11 -0000	1.961
@@ -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 at redhat.com>
 
 	* dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly