projects / elisp / semi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 22975e9)
Delete conflict indicator.
authorkeiichi <keiichi>
Thu, 4 Mar 1999 01:29:11 +0000 (01:29 +0000)
committerkeiichi <keiichi>
Thu, 4 Mar 1999 01:29:11 +0000 (01:29 +0000)
ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 898e709..60fa398 100644 (file)
--- 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.