[audacity: 9/9] Merge for 1.3.12-0.6.beta

[Manuel F Martinez]

commit 4409dd77edbee0f50acb56cc5271892a86249010
Author: Manuel F Martinez <manpaz at bashlinux.com>
Date:   Fri Dec 10 22:14:13 2010 -0800

    Merge for 1.3.12-0.6.beta

 audacity.spec |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/audacity.spec b/audacity.spec
index 1e14d3c..23e11ac 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -4,11 +4,7 @@
 Name: audacity
 
 Version: 1.3.12
-<<<<<<< HEAD
 Release: 0.6.beta%{?dist}
-=======
-Release: 0.4.beta%{?dist}
->>>>>>> origin/f13/master
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -159,15 +155,12 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
-<<<<<<< HEAD
 * Tue Dec  7 2010 Manuel F Martinez <manpaz at bashlinux.com> - 1.3.12-0.6.beta
 - Create gcc45 patch to fix issues with configure in portmixer
 
 * Wed Jul 14 2010 Dan Horák <dan at danny.cz> - 1.3.12-0.5.beta
 - rebuilt against wxGTK-2.8.11-2
 
-=======
->>>>>>> origin/f13/master
 * Mon Jun 28 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.4.beta
 - mods to ease diffs between builds for fedora and full
 
@@ -176,11 +169,8 @@ update-desktop-database &> /dev/null || :
 
 * Mon Jun 28 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.2.beta
 - mod tartopdir to use package version macro
-<<<<<<< HEAD
 
 * Mon Jun 28 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.1.beta
-=======
->>>>>>> origin/f13/master
 - upgrade to 1.3.12-beta
 - package new icons found in icons/hicolor