From b4f35c20f10a75ceeb10c8d9695149995c73cbef Mon Sep 17 00:00:00 2001
From: Emmanuel Papin <manupap01@gmail.com>
Date: Sat, 13 Dec 2014 22:06:30 +0100
Subject: [PATCH] Fix a conflict when merging plugin_support

---
 distros/debian8/zoneminder.dirs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/distros/debian8/zoneminder.dirs b/distros/debian8/zoneminder.dirs
index eeb6a6c46..c8537de1d 100644
--- a/distros/debian8/zoneminder.dirs
+++ b/distros/debian8/zoneminder.dirs
@@ -6,3 +6,5 @@ var/cache/zoneminder/temp
 usr/share/zoneminder/db
 usr/share/dbconfig-common/data/zoneminder/install
 usr/share/dbconfig-common/data/zoneminder/upgrade/mysql
+etc/zm/plugins.d
+usr/share/zoneminder/plugins