[vdr-skindesigner/f24] Update to 1.2.2

[Martin Gansser]

commit 67ac53bd34d4ee1616ce3673db43e09ed13c3dca
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat Sep 24 19:12:02 2016 +0200

    Update to 1.2.2

 vdr-skindesigner.spec | 7 -------
 1 file changed, 7 deletions(-)
---
diff --git a/vdr-skindesigner.spec b/vdr-skindesigner.spec
index 50ec89a..f5156ba 100644
--- a/vdr-skindesigner.spec
+++ b/vdr-skindesigner.spec
@@ -1,9 +1,5 @@
 Name:           vdr-skindesigner
-<<<<<<< HEAD
-Version:        1.2.1
-=======
 Version:        1.2.2
->>>>>>> master
 Release:        1%{?dist}
 Summary:        A VDR skinning engine that displays XML based Skins
 
@@ -120,12 +116,9 @@ ldconfig -n %{buildroot}%{_libdir}
 %{_includedir}/libskindesignerapi/*
 
 %changelog
-<<<<<<< HEAD
-=======
 * Sat Sep 24 2016 Martin Gansser <martinkg at fedoraproject.org> - 1.2.2-1
 - Update to 1.2.2
 
->>>>>>> master
 * Sun Jul 31 2016 Martin Gansser <martinkg at fedoraproject.org> - 1.2.1-1
 - Update to 1.2.1