--- rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 13:27:17	1.7
+++ rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 13:27:57	1.8
@@ -1,9 +1,8 @@
-# $Id: smeserver-mediawiki.spec,v 1.6 2022/06/01 13:23:19 brianr Exp $
+# $Id: smeserver-mediawiki.spec,v 1.7 2022/06/01 13:27:17 brianr Exp $
 # Authority: ber_die
 # Name: Dietmar Berteld
 
 %define name smeserver-mediawiki
-<<<<<<< smeserver-mediawiki.spec
 %define version 1.37.2
 %define release 2
 =======