hvad pushed to shinken (f22). "path.cfg file"

[notifications at fedoraproject.org]

From 6d45a6b71921c5476ec2bc5137f57647aa977275 Mon Sep 17 00:00:00 2001
From: hvad <david.hannequin at gmail.com>
Date: Sat, 14 Feb 2015 17:19:46 +0100
Subject: path.cfg file


diff --git a/shinken.spec b/shinken.spec
index e550f44..de509b1 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -550,12 +550,9 @@ fi
 %attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/run/%{name}
 
 %changelog
-<<<<<<< HEAD
-=======
 * Thu May 7 2015 David Hannequin <david.hannequin at gmail.com> - 2.2-4
 - Add path.cfg file
 
->>>>>>> master
 * Fri Mar 27 2015 David Hannequin <david.hannequin at gmail.com> - 2.2-3
 - Fix bad daemon configuration file.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/shinken.git/commit/?h=f22&id=6d45a6b71921c5476ec2bc5137f57647aa977275