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

[notifications at fedoraproject.org]

From 36f078c5dda8c42161e26f1d89a8e7f7539c7f01 Mon Sep 17 00:00:00 2001
From: hvad <david.hannequin at gmail.com>
Date: Sat, 14 Feb 2015 17:20:47 +0100
Subject: path.cfg file


diff --git a/shinken.spec b/shinken.spec
index de509b1..baa4364 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -5,11 +5,7 @@
 Summary:        Python Monitoring tool
 Name:           shinken
 Version:        2.2
-<<<<<<< HEAD
-Release:        3%{?dist}
-=======
 Release:        4%{?dist}
->>>>>>> master
 URL:            http://www.%{name}-monitoring.org
 Source0:        https://github.com/naparuba/%{name}/archive/%{version}.tar.gz 
 Source1:        %{name}-arbiter.service
-- 
cgit v0.10.2


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