Further correction of merge conflict 2

This commit is contained in:
Brendan Jones 2011-10-30 12:28:35 +01:00
parent 10aa6df6cb
commit a09033253f

View File

@ -7,14 +7,6 @@
Name: guitarix Name: guitarix
Version: 0.19.0 Version: 0.19.0
Release: 1.0.%{svnrevision}%{?dist} Release: 1.0.%{svnrevision}%{?dist}
=======
Name: guitarix
=======
Name: guitarix
Version: 0.17.0
Release: 2%{?dist}
Summary: Mono amplifier to JACK Summary: Mono amplifier to JACK
Group: Applications/Multimedia Group: Applications/Multimedia
License: GPLv2+ License: GPLv2+