[shinken/epel7] new source

[david hannequin]

commit ee44dea3351afd0f6a0dcc258c94671553e73341
Author: hvad <david.hannequin at gmail.com>
Date:   Fri Feb 13 20:10:11 2015 +0100

    new source

 sources | 18 ------------------
 1 file changed, 18 deletions(-)
---
diff --git a/sources b/sources
index 81810f5..66efa2a 100644
--- a/sources
+++ b/sources
@@ -1,19 +1 @@
-<<<<<<< HEAD
-c40206b87038c8af66f8bf5ab21163a6  shinken.8shinken
-97b672fb376b441c73cf585136b5ac32  shinken-arbiter.init
-d46953b5ef611c4ddc32eb6139469435  shinken-broker.init
-d5c48cf70aaf5496ba1eaa3cf742295c  shinken-poller.init
-7fdd79ef56ac5ed5f97f20cb73112532  shinken-reactionner.init
-6f816c8dc650706ca14f82c279d09b79  shinken-receiver.init
-daa1c56b46e3a7af639813116239f662  shinken-scheduler.init
-7a27dee87e1aa7d4c5091a8b2db130a8  shinken-arbiter.service
-d971d100954b1b5c0ff6cd4171bf6650  shinken-broker.service
-827e8d61d2443bf66663ae5aa14111b5  shinken-poller.service
-6583451c1e0c439375674e1dbe40f6d4  shinken-reactionner.service
-ce14b4a17e687e0b10120ca9b67f93a5  shinken-receiver.service
-34c8d400485672493f16d77504d29e0f  shinken-scheduler.service
-2ea403179e257fb640b2b555598cacc4  2.0.3.tar.gz
-05b23d43b493dafb693f10d36a2f9a1c  path.cfg
-=======
 796db5b6b439f50f91b07c75b7ec8eeb  2.2.tar.gz
->>>>>>> master