[guitarix] Further correction of merge conflict 2
Brendan Jones
bsjones at fedoraproject.org
Sun Oct 30 11:28:47 UTC 2011
commit a09033253ff0efa17963190e3febcf92d386c5c4
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date: Sun Oct 30 12:28:35 2011 +0100
Further correction of merge conflict 2
guitarix.spec | 8 --------
1 files changed, 0 insertions(+), 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+
More information about the scm-commits
mailing list