From 7d1b18189a447e4c4ee94a462c16136aa1d36ef5 Mon Sep 17 00:00:00 2001
From: okada <okada>
Date: Wed, 12 Jul 2000 04:54:09 +0000
Subject: [PATCH] fix

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

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