remove conflict droppings

--Larry svn path=/trunk/; revision=12938
2001-09-18 05:29:16 +00:00
parent 61f7037ff4
commit 643ea02eee
1 changed files with 0 additions and 1 deletions
--- 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):