From: keiichi <keiichi>
Date: Thu, 4 Mar 1999 01:29:11 +0000 (+0000)
Subject: Delete conflict indicator.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=58b3aad249bbc9b1babd74490a0305d8f50c221e;p=elisp%2Fsemi.git

Delete conflict indicator.
---

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.