aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorLarry Ewing <lewing@src.gnome.org>2003-12-02 08:20:43 +0800
committerLarry Ewing <lewing@src.gnome.org>2003-12-02 08:20:43 +0800
commit9b2e5956080b08da3611996c7f12158fcfe3e06d (patch)
tree33315c5e28d32842a437cac25dd90bb4f00e9efa /addressbook
parent7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7 (diff)
downloadgsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.tar
gsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.tar.gz
gsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.tar.bz2
gsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.tar.lz
gsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.tar.xz
gsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.tar.zst
gsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.zip
remove stray conflict marker
svn path=/trunk/; revision=23554
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 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