[munin/el6] Re-merge spec file

[fenris02]

commit f8698d362a01b8fb1267b91686f58fb4b5a2a07b
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Apr 28 13:36:49 2013 -0500

    Re-merge spec file

 munin.spec |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/munin.spec b/munin.spec
index fd9d91d..44b579f 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,11 +1,6 @@
 Name:           munin
-<<<<<<< HEAD
-Version:        2.0.12
-Release:        2%{?dist}
-=======
 Version:        2.0.13
 Release:        1%{?dist}
->>>>>>> origin/master
 Summary:        Network-wide graphing framework (grapher/gatherer)
 
 Group:          System Environment/Daemons
@@ -777,8 +772,6 @@ exit 0
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Fri Apr 26 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.13-1
 - Upstream released 2.0.13
 
@@ -789,7 +782,6 @@ exit 0
 * Mon Apr 01 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.12-3
 - Add fw_ default config
 
->>>>>>> origin/master
 * Sun Mar 24 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.12-2
 - BZ# 917002 minor edits for asyncd