diff options
Diffstat (limited to 'conf/plugins.conf')
| -rw-r--r-- | conf/plugins.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/conf/plugins.conf b/conf/plugins.conf index 264592fa9..779783d3e 100644 --- a/conf/plugins.conf +++ b/conf/plugins.conf @@ -14,7 +14,11 @@ //== Description ===================================== //The plugin system allows you to create customized scripts //outside of the source. These scripts won't conflict with any +<<<<<<< HEAD //future source updates - think about it as a /conf/import/ version of the source. +======= +//future source updates - think of it as a /conf/import/ for the source. +>>>>>>> upstream/master //==================================================== /* --------------- Format --------------- |