projects / elisp / flim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix
[elisp/flim.git] / Makefile
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