From: okada <okada>
Date: Wed, 12 Jul 2000 04:54:09 +0000 (+0000)
Subject: fix
X-Git-Tag: slim-1_14_0~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7d1b18189a447e4c4ee94a462c16136aa1d36ef5;p=elisp%2Fflim.git

fix
---

diff --git a/Makefile b/Makefile
index 396fae0..72a037a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 # Makefile for FLIM.
 #
 
-<<<<<<< Makefile
 PACKAGE = slim
 API	= 1.14
 RELEASE = 1