[munin/f18] unbork the previous merge

[fenris02]

commit cda7dbdf4f170cf5dfeaa67d7f3f00d961377a77
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Mar 23 22:32:40 2013 -0500

    unbork the previous merge

 munin.spec |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/munin.spec b/munin.spec
index f93ed29..d68fe53 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,11 +1,6 @@
 Name:           munin
-<<<<<<< HEAD
-Version:        2.0.11.1
-Release:        3%{?dist}
-=======
 Version:        2.0.12
 Release:        2%{?dist}
->>>>>>> origin/master
 Summary:        Network-wide graphing framework (grapher/gatherer)
 
 Group:          System Environment/Daemons
@@ -727,11 +722,6 @@ exit 0
 
 
 %changelog
-<<<<<<< HEAD
-* Sun Mar 03 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.11.1-3
-- BZ# 917002 minor edits for asyncd
-
-=======
 * Sun Mar 24 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.12-2
 - BZ# 917002 minor edits for asyncd
 
@@ -741,7 +731,6 @@ exit 0
 * Sat Mar 09 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.11.1-3
 - Update systemd scriptlets
 
->>>>>>> origin/master
 * Fri Feb 22 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.11.1-2
 - BZ# 913111 Removed R:webserver because it pulls boa .. and no clean way to
   prefer apache.