[lv2-abGate: 2/2] Fix merging

[Brendan Jones]

commit 661eb91a03aa67d15a3586a14805ec422cbcce57
Merge: 42af076 ba382b1
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Fri May 11 06:18:55 2012 +0200

    Fix merging

 lv2-abGate.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc lv2-abGate.spec
index 7f7760e,ebfa7e7..f045c99
--- a/lv2-abGate.spec
+++ b/lv2-abGate.spec
@@@ -44,9 -44,12 +44,16 @@@ make install DESTDIR=%{buildroot
  
  
  %changelog
 +* Fri May 11 2012 Brendan Jones <brendan.jones.it at gmail.com> 1.1.3-3
 +- Build against new lv2
 +
+ * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-4
+ - Rebuilt for c++ ABI breakage
+ 
+ * Fri Jan 20 2012 Dan Horák <dan[at]danny.cz> 1.1.3-3
+ - fix build on non-x86 64-bit arches
++>>>>>>> ba382b17325e27884aad8cddbeceae1fc61307f9
+ 
  * Fri Jan 6 2012 Brendan Jones <brendan.jones.it at gmail.com> 1.1.3-2
  - Removed lv2config