aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2001-07-21 02:26:10 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-07-21 02:26:10 +0800
commit78cdb79e5a9f464ede40ea1caa373cf46e24de4b (patch)
tree1cf9d2928e15d3fd3a5e053f0d6ebe9fad73c50b
parent8a361c78f0cfad3ae56e9bc8e5387b3e66d05429 (diff)
downloadgsoc2013-evolution-78cdb79e5a9f464ede40ea1caa373cf46e24de4b.tar.gz
gsoc2013-evolution-78cdb79e5a9f464ede40ea1caa373cf46e24de4b.tar.zst
gsoc2013-evolution-78cdb79e5a9f464ede40ea1caa373cf46e24de4b.zip
er, unbroke changelog
svn path=/trunk/; revision=11265
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 280dbcddfe..694fe38f0d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -52,7 +52,6 @@
(destination_folder_handle_motion): Ditto.
(destination_folder_handle_drop): Ditto.
->>>>>>> 1.1426
2001-07-19 Not Zed <NotZed@Ximian.com>
* mail-local.c (reconfigure_folder_reconfigure): remvoed