From b950c435e47637e109a1b5c4916024b5c7e322eb Mon Sep 17 00:00:00 2001
From: Jon Trowbridge <trow@src.gnome.org>
Date: Sat, 7 Jul 2001 05:41:00 +0000
Subject: Removed old CVS conflict marker.

svn path=/trunk/; revision=10879
---
 mail/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e0149b20dc..6e09d51153 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -48,7 +48,6 @@
 
 2001-07-06  Peter Williams  <peterw@ximian.com>
 
->>>>>>> 1.1360
 	* mail-callbacks.c (composer_postpone_cb): Don't free the psd here --
 	it will be freed on the "destroy" signal.
 
-- 
cgit v1.2.3