From 2d6e81c61c6f6366b4d75af2c03201a2ad0b802a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Coavoux?= <s.coavoux@free.fr>
Date: Mon, 13 Mar 2017 09:24:38 -0400
Subject: [PATCH] Remove merge conflict resident file

---
 alignak/debian/alignak-all.install.orig | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 alignak/debian/alignak-all.install.orig

diff --git a/alignak/debian/alignak-all.install.orig b/alignak/debian/alignak-all.install.orig
deleted file mode 100644
index c4ea35a..0000000
--- a/alignak/debian/alignak-all.install.orig
+++ /dev/null
@@ -1,12 +0,0 @@
-#bin/init.d/alignak* /etc/init.d/
-#etc/default/alignak
-etc/daemons/* /etc/alignak/daemons/
-etc/certs/* /etc/alignak/certs/
-etc/alignak.cfg /etc/alignak/
-<<<<<<< 0a0e8a8e31d6b8be157129a6db9b7811e5b8171c
-etc/arbiter/* /etc/alignak/arbiter
-
-=======
-etc/arbiter_cfg/* /etc/alignak/arbiter_cfg
-systemd/* /lib/systemd/system/
->>>>>>> Add: Packaging for systemd.