From dbf040c3aa57197be8fec80bee1dd38420ea516a Mon Sep 17 00:00:00 2001
From: Daniel Steiner <daniel.steiner@greenmail.ch>
Date: Sat, 27 Jul 2019 16:18:12 +0200
Subject: [PATCH] Polemarch wrong version removed

---
 fedora/SPECS/polemarch.spec | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec
index ceba426..20e30e6 100644
--- a/fedora/SPECS/polemarch.spec
+++ b/fedora/SPECS/polemarch.spec
@@ -15,11 +15,7 @@
 %define namebase polemarch
 %define user polemarch
 %define datad poledata
-<<<<<<< HEAD
-%define version 1.2.2
-=======
 %define version 1.3.1
->>>>>>> ebbf0ac45fc8d9ebd3f0f316186518df44db17ce
 %define release 1
 %define __prelink_undo_cmd %{nil}
 %define _binaries_in_noarch_packages_terminate_build   0
@@ -115,13 +111,8 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate
 [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
 
 %changelog
-<<<<<<< HEAD
-* Thu Jun 20 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
-- Update to 1.2.2 version.
-=======
 * Sat Jul 13 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - Update to 1.3.1 version.
->>>>>>> ebbf0ac45fc8d9ebd3f0f316186518df44db17ce
 
 * Mon Jun 15 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - Update to 1.2.1 version.