From: okada <okada>
Date: Tue, 27 Jun 2000 03:19:13 +0000 (+0000)
Subject: fix
X-Git-Tag: slim-1_14_0~4
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=eff7f102975e1c46578bbe1a0c8fa0ffd068fca3;p=elisp%2Fflim.git

fix
---

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