From 643ea02eee788d203810e9208debb2011834756d Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@src.gnome.org>
Date: Tue, 18 Sep 2001 05:29:16 +0000
Subject: remove conflict droppings

--Larry

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

(limited to 'addressbook')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 08e2e7a40b..657a85e088 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -46,7 +46,6 @@
 	assumed that event->button.button is 1, 2, or 3, causing disaster
 	when using a wheel-mouse.  Fixed. (bug #9400)
 
->>>>>>> 1.776
 2001-09-16  Chris Toshok  <toshok@ximian.com>
 
 	* gui/contact-editor/e-contact-editor.c (_phone_arrow_pressed):
-- 
cgit v1.2.3