From a09033253ff0efa17963190e3febcf92d386c5c4 Mon Sep 17 00:00:00 2001
From: Brendan Jones <brendan.jones.it@gmail.com>
Date: Sun, 30 Oct 2011 12:28:35 +0100
Subject: [PATCH] Further correction of merge conflict 2

---
 guitarix.spec | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/guitarix.spec b/guitarix.spec
index cfe80ef..9aebe22 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -7,14 +7,6 @@
 Name:           guitarix
 Version:        0.19.0
 Release:        1.0.%{svnrevision}%{?dist}
-=======
-
-Name:           guitarix
-=======
-
-Name:           guitarix
-Version:        0.17.0
-Release:        2%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+