projects / elisp / flim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e9bc5bb)
fix
authorokada <okada>
Tue, 27 Jun 2000 03:19:13 +0000 (03:19 +0000)
committerokada <okada>
Tue, 27 Jun 2000 03:19:13 +0000 (03:19 +0000)
ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 9d6006e..6a8ae15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -698,7 +698,6 @@
        * FLIM-ELS: Use `if' instead of `unless'.
 
 \f
->>>>>>> 1.134.2.18
 1999-08-17  MORIOKA Tomohiko  <tomo@m17n.org>
 
        * FLIM: Version 1.13.2 (Kasanui) released.