From c8b0ef5a08f22a18b6d156293e21ac350907d9ff Mon Sep 17 00:00:00 2001
From: Brendan Jones <brendan.jones.it@gmail.com>
Date: May 11 2012 03:49:07 +0000
Subject: Fix merging


---

diff --git a/rosegarden-12.04.tar.bz2 b/rosegarden-12.04.tar.bz2
new file mode 100644
index 0000000..d5383a7
Binary files /dev/null and b/rosegarden-12.04.tar.bz2 differ
diff --git a/rosegarden4.spec b/rosegarden4.spec
index bb1ed18..0bcf3c4 100644
--- a/rosegarden4.spec
+++ b/rosegarden4.spec
@@ -3,7 +3,7 @@
 
 Name:          rosegarden4
 Version:       %{maj}%{?min}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       MIDI, audio and notation editor
 Group:         Applications/Multimedia
 License:       GPLv2+
@@ -142,10 +142,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc data/fonts/README COPYING
 
 %changelog
+<<<<<<< HEAD
 * Thu May 10 2012 Brendan Jones <brendan.jones.it@gmail.com> - 12.04-1
 - New upstream 12.04
 - rmove gcc patch accepted upstream
 
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 11.11.42-2
+- Rebuilt for c++ ABI breakage
+
 * Tue Jan 17 2012 Brendan Jones <brendan.jones.it@gmail.com> - 11.11.42-1
 - Patch for GCC 4.7 FTB
 - New upstream 11.11.42