From 140646cd3d7d31dac103cb04a674316a5c4a0a3a Mon Sep 17 00:00:00 2001
From: David Timms <dtimms@iinet.net.au>
Date: Jul 19 2015 03:14:08 +0000
Subject: missed merge confict boundary.


---

diff --git a/audacity.spec b/audacity.spec
index af0e0e2..faf52b4 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -205,7 +205,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
-<<<<<<< Updated upstream
 * Sun Jul 19 2015 David Timms <iinet.net.au@dtimms> - 2.1.1-1
 - Release of Audacity 2.1.1.