From eff7f102975e1c46578bbe1a0c8fa0ffd068fca3 Mon Sep 17 00:00:00 2001
From: okada <okada>
Date: Tue, 27 Jun 2000 03:19:13 +0000
Subject: [PATCH] fix

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

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.
-- 
1.7.10.4