diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/plugins.conf | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/conf/plugins.conf b/conf/plugins.conf index 779783d3e..58ecb7144 100644 --- a/conf/plugins.conf +++ b/conf/plugins.conf @@ -14,11 +14,7 @@ //== 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 --------------- |