[guitarix: 4/4] Fix conflicts

[Brendan Jones]

commit 540b038bad7e4522192ae9c399c2d30aad1a80f6
Merge: 317de01 eb2f880
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Sun Oct 30 13:05:15 2011 +0100

    Fix conflicts

 .gitignore    |    3 +++
 guitarix.spec |    8 ++++++++
 sources       |    4 ++++
 3 files changed, 15 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 04fb439,ff4d182..94e2d54
--- a/.gitignore
+++ b/.gitignore
@@@ -3,4 -3,3 +3,7 @@@ guitarix-0.11.0.tar.bz
  /guitarix-0.11.1.tar.bz2
  /guitarix2-0.16.0.tar.bz2
  /guitarix2-0.17.0.tar.bz2
++<<<<<<< HEAD
 +/guitarix2-0.19.0-svn1245.tar.bz2
++=======
++>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
diff --cc guitarix.spec
index 82631a6,37b46d5..aeac4da
--- a/guitarix.spec
+++ b/guitarix.spec
@@@ -2,14 -2,8 +2,19 @@@
  # project name remains guitarix however
  %global altname gx_head
  %global altname2 guitarix2
++<<<<<<< HEAD
 +%global svnrevision svn1245
  
  Name:           guitarix
 +Version:        0.19.0
 +Release:        1.0.%{svnrevision}%{?dist}
 +=======
 +
 +Name:           guitarix
++=======
++
++Name:           guitarix
++>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
  Version:        0.17.0
  Release:        2%{?dist}
  Summary:        Mono amplifier to JACK
@@@ -130,9 -123,6 +135,12 @@@ rm -rf %{buildroot
  %{_libdir}/ladspa/*.so
  
  %changelog
++<<<<<<< HEAD
 +* Sun Oct 30 2011 Brendan Jones <brendan.jones.it at 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 at gmail.com> - 0.17.0-2
  - Correct changelog to prevent rpmlint warnings
  
diff --cc sources
index 56f490f,bc07112..70659e1
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +22e1bc92e0804467b22f28b16ca57b50  guitarix2-0.19.0-svn1245.tar.bz2
++=======
+ e915d5f2f4fcdda0f9614678d04d9bd1  guitarix2-0.17.0.tar.bz2
++>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b