Further correction of merge conflict
This commit is contained in:
parent
540b038bad
commit
10aa6df6cb
@ -2,7 +2,6 @@
|
|||||||
# project name remains guitarix however
|
# project name remains guitarix however
|
||||||
%global altname gx_head
|
%global altname gx_head
|
||||||
%global altname2 guitarix2
|
%global altname2 guitarix2
|
||||||
<<<<<<< HEAD
|
|
||||||
%global svnrevision svn1245
|
%global svnrevision svn1245
|
||||||
|
|
||||||
Name: guitarix
|
Name: guitarix
|
||||||
@ -14,7 +13,6 @@ Name: guitarix
|
|||||||
=======
|
=======
|
||||||
|
|
||||||
Name: guitarix
|
Name: guitarix
|
||||||
>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
|
|
||||||
Version: 0.17.0
|
Version: 0.17.0
|
||||||
Release: 2%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Mono amplifier to JACK
|
Summary: Mono amplifier to JACK
|
||||||
@ -135,12 +133,9 @@ rm -rf %{buildroot}
|
|||||||
%{_libdir}/ladspa/*.so
|
%{_libdir}/ladspa/*.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
<<<<<<< HEAD
|
|
||||||
* Sun Oct 30 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.19.0-1.0.svn1245
|
* 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
|
- 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
|
* Fri Jul 15 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.17.0-2
|
||||||
- Correct changelog to prevent rpmlint warnings
|
- Correct changelog to prevent rpmlint warnings
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user