Fix a conflict when merging plugin_support

This commit is contained in:
Emmanuel Papin 2014-12-13 22:06:30 +01:00
parent f339518787
commit b4f35c20f1
1 changed files with 2 additions and 0 deletions

View File

@ -6,3 +6,5 @@ var/cache/zoneminder/temp
usr/share/zoneminder/db usr/share/zoneminder/db
usr/share/dbconfig-common/data/zoneminder/install usr/share/dbconfig-common/data/zoneminder/install
usr/share/dbconfig-common/data/zoneminder/upgrade/mysql usr/share/dbconfig-common/data/zoneminder/upgrade/mysql
etc/zm/plugins.d
usr/share/zoneminder/plugins