Fix a conflict when merging plugin_support
This commit is contained in:
parent
f339518787
commit
b4f35c20f1
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue