From 58b3aad249bbc9b1babd74490a0305d8f50c221e Mon Sep 17 00:00:00 2001
From: keiichi <keiichi>
Date: Thu, 4 Mar 1999 01:29:11 +0000
Subject: [PATCH] Delete conflict indicator.

---
 ChangeLog |    1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 898e709..60fa398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -276,7 +276,6 @@
 
 1998-11-17  Kazuhiro Ohta     <ohta@ele.cst.nihon-u.ac.jp>
 
->>>>>>> 1.349.2.5
 	* mime-partial.el
 	(mime-combine-message/partial-pieces-automatically): Fix
 	DOC-string.
-- 
1.7.10.4