[shinken/f18] fix spec file.

[david hannequin]

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

    fix spec file.
    
    Conflicts:
    	shinken.spec

 shinken.commands.cfg |  248 --------------------------------------------------
 shinken.spec         |   10 ++
 2 files changed, 10 insertions(+), 248 deletions(-)
---
diff --git a/shinken.spec b/shinken.spec
index ac28949..98446bb 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -6,10 +6,14 @@ Summary:        Python Monitoring tool
 Name:           shinken
 Version:        1.2.4
 <<<<<<< HEAD
+<<<<<<< HEAD
 Release:        2%{?dist}
 =======
 Release:        4%{?dist}
 >>>>>>> d162d28... fix spec file.
+=======
+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
@@ -531,9 +535,12 @@ fi
 
 %changelog
 <<<<<<< HEAD
+<<<<<<< HEAD
 * Wed Mar 6 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-2
 - Fix discovery rule.
 =======
+=======
+>>>>>>> d162d28... fix spec file.
 * Sat Mar 9 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-4
 - Add Webui menu patch.
 >>>>>>> d162d28... fix spec file.
@@ -541,6 +548,9 @@ fi
 * Wed Mar 6 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-2
 - Fix discovery rules.
 
+* 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.