[shinken/f18] fix spec file.

[david hannequin]

commit 5b71d399eb97dbd513fd63a1faf09c611076148a
Author: hvad <david.hannequin at gmail.com>
Date:   Sat Mar 9 21:06:22 2013 +0100

    fix spec file.
    
    Conflicts:
    	shinken.spec

 shinken.spec |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/shinken.spec b/shinken.spec
index 0256ddc..ac28949 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -5,7 +5,11 @@
 Summary:        Python Monitoring tool
 Name:           shinken
 Version:        1.2.4
+<<<<<<< HEAD
 Release:        2%{?dist}
+=======
+Release:        4%{?dist}
+>>>>>>> d162d28... fix spec file.
 URL:            http://www.%{name}-monitoring.org
 Source0:        http://www.%{name}-monitoring.org/pub/%{name}-%{version}.tar.gz
 Source1:        %{name}-commands.cfg
@@ -526,8 +530,16 @@ fi
 %attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+<<<<<<< HEAD
 * Wed Mar 6 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-2
 - Fix discovery rule.
+=======
+* Sat Mar 9 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-4
+- Add Webui menu patch.
+>>>>>>> d162d28... fix spec file.
+
+* Wed Mar 6 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-2
+- Fix discovery rules.
 
 * Sun Feb 24 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-1
 - Update from upstream.