[shinken/f19] new sources

[david hannequin]

commit 93fec51c84d03e820369e7d3fddd4feccf618556
Author: hvad <david.hannequin at gmail.com>
Date:   Sat Jun 14 11:17:19 2014 +0200

    new sources

 .gitignore |   13 +++++++++++++
 sources    |    4 ----
 2 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3863834..fbee71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,16 @@
 /shinken-1.2.4.tar.gz
 /shinken-1.4.tar.gz
 /shinken-1.4.1.tar.gz
+/shinken-arbiter.service
+/shinken-broker.service
+/shinken-poller.service
+/shinken-reactionner.service
+/shinken-receiver.service
+/shinken-scheduler.service
+/shinken-arbiter.init
+/shinken-broker.init
+/shinken-poller.init
+/shinken-reactionner.init
+/shinken-receiver.init
+/shinken-scheduler.init
+/2.0.3.tar.gz
diff --git a/sources b/sources
index 8dbdd81..8a3b304 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-bc31680220688cbbb868d4fdd2c1687d  shinken-1.4.1.tar.gz
-=======
 7a27dee87e1aa7d4c5091a8b2db130a8  shinken-arbiter.service
 d971d100954b1b5c0ff6cd4171bf6650  shinken-broker.service
 827e8d61d2443bf66663ae5aa14111b5  shinken-poller.service
@@ -14,4 +11,3 @@ d5c48cf70aaf5496ba1eaa3cf742295c  shinken-poller.init
 6f816c8dc650706ca14f82c279d09b79  shinken-receiver.init
 daa1c56b46e3a7af639813116239f662  shinken-scheduler.init
 2ea403179e257fb640b2b555598cacc4  2.0.3.tar.gz
->>>>>>> 1656df7... new sources