aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorLarry Ewing <lewing@src.gnome.org>2001-09-18 13:29:16 +0800
committerLarry Ewing <lewing@src.gnome.org>2001-09-18 13:29:16 +0800
commit643ea02eee788d203810e9208debb2011834756d (patch)
tree78c83bd505133e922d21d501a620c9cc9adca6de /addressbook
parent61f7037ff4b1ea359bedc2348177fedf7d15b605 (diff)
downloadgsoc2013-evolution-643ea02eee788d203810e9208debb2011834756d.tar.gz
gsoc2013-evolution-643ea02eee788d203810e9208debb2011834756d.tar.zst
gsoc2013-evolution-643ea02eee788d203810e9208debb2011834756d.zip
remove conflict droppings
--Larry svn path=/trunk/; revision=12938
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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):