projects / elisp / flim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a6c65dc)
fix
authorokada <okada>
Wed, 12 Jul 2000 04:54:09 +0000 (04:54 +0000)
committerokada <okada>
Wed, 12 Jul 2000 04:54:09 +0000 (04:54 +0000)
Makefile patch | blob | history

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