aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJon Trowbridge <trow@src.gnome.org>2001-08-16 14:23:11 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-08-16 14:23:11 +0800
commitca8708ec266e05757bd68adec0520b95c25aa9b4 (patch)
tree0150ba7c42d276769356f868abf49150e44b1b7a /mail
parentfef28ce070e3d25b8837ca8015936cb6b7ddf08d (diff)
downloadgsoc2013-evolution-ca8708ec266e05757bd68adec0520b95c25aa9b4.tar
gsoc2013-evolution-ca8708ec266e05757bd68adec0520b95c25aa9b4.tar.gz
gsoc2013-evolution-ca8708ec266e05757bd68adec0520b95c25aa9b4.tar.bz2
gsoc2013-evolution-ca8708ec266e05757bd68adec0520b95c25aa9b4.tar.lz
gsoc2013-evolution-ca8708ec266e05757bd68adec0520b95c25aa9b4.tar.xz
gsoc2013-evolution-ca8708ec266e05757bd68adec0520b95c25aa9b4.tar.zst
gsoc2013-evolution-ca8708ec266e05757bd68adec0520b95c25aa9b4.zip
Remove some stray cvs collision markers.
svn path=/trunk/; revision=12082
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog4
1 files changed, 0 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index afc779a7d6..d3d082f918 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -38,7 +38,6 @@
* message-list.c (regen_list_regen): Remove camel operation
registration/etc.
->>>>>>> 1.1564
2001-08-14 Jeffrey Stedfast <fejj@ximian.com>
* mail-accounts.c (load_accounts): Convert the UTF-8 account name
@@ -170,7 +169,6 @@
(mail_config_remove_account): When deleting the account, remove
its shortcuts.
-<<<<<<< ChangeLog
2001-08-10 Peter Williams <peterw@ximian.com>
* mail-config-druid.c (druid_finish): Whoa, fatal typo. Sorry.
@@ -277,8 +275,6 @@
* mail-config-druid.c (druid_finish): See news_add_destroyed above.
-=======
->>>>>>> 1.1561
2001-08-10 Jeffrey Stedfast <fejj@ximian.com>
* mail-config.c (mail_config_get_show_preview): Free dbkey if we