From 41f86aac2b8893ead77ad60d639eaa397edf3fe0 Mon Sep 17 00:00:00 2001
From: d. johnson <fenris02@fedoraproject.org>
Date: Feb 11 2017 04:46:00 +0000
Subject: Merge/conflict


---

diff --git a/munin.spec b/munin.spec
index 8eb8247..67682e5 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:           munin
 Version:        2.0.30
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Network-wide graphing framework (grapher/gatherer)
 
 Group:          System Environment/Daemons
@@ -877,9 +877,12 @@ exit 0
 
 
 %changelog
-* Sun Jan 29 2017 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.30-3
+* Sun Jan 29 2017 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.30-4
 - added Pablo Chamorro packaging suggestions for helping CGI scripts
 
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Wed Jan 25 2017 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.30-2
 - RHBZ#: 1416199 - Munin-node is unable to determine FQDN hostname at boot