From c0af9ae948d8e7aa7d53bb3aefdcb792d97eae32 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Fri, 5 Oct 2001 22:17:04 +0000
Subject: Fix a merge-conflict leftover.

2001-10-05  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-mt.c (pass_got): Fix a merge-conflict leftover.

svn path=/trunk/; revision=13474
---
 mail/ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'mail/ChangeLog')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6ae2d17b7b..cc7326654e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-05  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-mt.c (pass_got): Fix a merge-conflict leftover.
+
 2001-10-05    <NotZed@Ximian.com>
 
 	* folder-browser.c: reformatted the menu tables so they're a bit
-- 
cgit v1.2.3