From 9b2e5956080b08da3611996c7f12158fcfe3e06d Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@src.gnome.org>
Date: Tue, 2 Dec 2003 00:20:43 +0000
Subject: remove stray conflict marker

svn path=/trunk/; revision=23554
---
 addressbook/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index b78e343fbb..9bb07f7968 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -157,7 +157,6 @@
 	(addressbook_model_set_uri): Use addressbook_load_source (). However,
 	this needs a bit more work to get source UIDs instead of URIs.
 
->>>>>>> 1.1484
 2003-11-26  JP Rosevear  <jpr@ximian.com>
 
 	* gui/widgets/Makefile.am: turn on deprecated gtk and libgnomeui
-- 
cgit