diff --git a/extern/Makefile b/extern/Makefile
index c7d6c647457..766f7f34d92 100644
--- a/extern/Makefile
+++ b/extern/Makefile
@@ -1,9 +1,4 @@
-#
-<<<<<<< Makefile
 # $Id$
-=======
-# $Id$
->>>>>>> 1.18
 #
 # ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
 #