Remove merge conflict resident file

Alignak-monitoring · Mar 13, 2017 · 2d6e81c · 2d6e81c
1 parent 606b499
commit 2d6e81c
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/alignak/debian/alignak-all.install.orig b/alignak/debian/alignak-all.install.orig