--- rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 13:23:19	1.6
+++ rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 13:27:17	1.7
@@ -1,4 +1,4 @@
-# $Id: smeserver-mediawiki.spec,v 1.5 2022/06/01 12:12:19 brianr Exp $
+# $Id: smeserver-mediawiki.spec,v 1.6 2022/06/01 13:23:19 brianr Exp $
 # Authority: ber_die
 # Name: Dietmar Berteld
 
@@ -6,8 +6,7 @@
 <<<<<<< smeserver-mediawiki.spec
 %define version 1.37.2
 %define release 2
-======
-
+=======
 >>>>>>> 1.5
 Summary:       Mediawiki Web Application for SME Server 7.x based on Mediawiki 1.37.2
 Name:          %{name}