aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMichael Zucci <zucchi@src.gnome.org>2002-07-01 12:58:49 +0800
committerMichael Zucci <zucchi@src.gnome.org>2002-07-01 12:58:49 +0800
commit71c83b40817aa3dcca189f1d40512772b89eae1c (patch)
treebc26813629a4d84e44362a59879ab31fef5b1969 /mail
parent613c4f1ce37ff136540cb0daf76c53b1b8a7a7b9 (diff)
downloadgsoc2013-evolution-71c83b40817aa3dcca189f1d40512772b89eae1c.tar.gz
gsoc2013-evolution-71c83b40817aa3dcca189f1d40512772b89eae1c.tar.zst
gsoc2013-evolution-71c83b40817aa3dcca189f1d40512772b89eae1c.zip
Removed some conflict indicators i missed.
svn path=/trunk/; revision=17332
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1fe82f5790..849ed97315 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -83,7 +83,6 @@
* mail-format.c (handle_multipart_signed): Use the new gpg cipher
context.
->>>>>>> 1.2235
2002-06-18 Jeffrey Stedfast <fejj@ximian.com>
* message-list.c (message_list_change_first_visible_parent): New