--- rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 13:27:57	1.8
+++ rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 13:28:34	1.9
@@ -1,12 +1,11 @@
-# $Id: smeserver-mediawiki.spec,v 1.7 2022/06/01 13:27:17 brianr Exp $
+# $Id: smeserver-mediawiki.spec,v 1.8 2022/06/01 13:27:57 brianr Exp $
 # Authority: ber_die
 # Name: Dietmar Berteld
 
 %define name smeserver-mediawiki
 %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}
 Version:       %{version}