Further correction of merge conflict

This commit is contained in:
Brendan Jones 2011-10-30 12:27:26 +01:00
parent 540b038bad
commit 10aa6df6cb
2 changed files with 0 additions and 9 deletions

View File

@ -2,7 +2,6 @@
# project name remains guitarix however
%global altname gx_head
%global altname2 guitarix2
<<<<<<< HEAD
%global svnrevision svn1245
Name: guitarix
@ -14,7 +13,6 @@ Name: guitarix
=======
Name: guitarix
>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
Version: 0.17.0
Release: 2%{?dist}
Summary: Mono amplifier to JACK
@ -135,12 +133,9 @@ rm -rf %{buildroot}
%{_libdir}/ladspa/*.so
%changelog
<<<<<<< HEAD
* Sun Oct 30 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.19.0-1.0.svn1245
- Grab source from svn to rebuild against zita-convolver-3
=======
>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
* Fri Jul 15 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.17.0-2
- Correct changelog to prevent rpmlint warnings

View File

@ -1,5 +1 @@
<<<<<<< HEAD
22e1bc92e0804467b22f28b16ca57b50 guitarix2-0.19.0-svn1245.tar.bz2
=======
e915d5f2f4fcdda0f9614678d04d9bd1 guitarix2-0.17.0.tar.bz2
>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b