From 5492fd9e937f77225e3d3e451038f5a0615709cd Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Wed, 3 Jun 2015 20:10:02 +0200 Subject: [PATCH] Fix conflict during package installation --- distros/debian8_cmake/zoneminder-core.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distros/debian8_cmake/zoneminder-core.install b/distros/debian8_cmake/zoneminder-core.install index afd9ada95..0926e7a51 100644 --- a/distros/debian8_cmake/zoneminder-core.install +++ b/distros/debian8_cmake/zoneminder-core.install @@ -1,4 +1,5 @@ -etc/zm +etc/zm/zm.conf +etc/zm/plugins.conf usr/bin usr/share/polkit-1/actions usr/share/polkit-1/rules.d