From 093193bd26b87f6afc876fd96b46271bd4e2ed81 Mon Sep 17 00:00:00 2001 From: Euphy Date: Thu, 20 Jun 2013 22:46:37 -0400 Subject: Merged conflicts. --- conf/plugins.conf | 4 ---- 1 file changed, 4 deletions(-) (limited to 'conf') 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 --------------- -- cgit v1.2.3-60-g2f50