diff options
| author | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
| commit | 093193bd26b87f6afc876fd96b46271bd4e2ed81 (patch) | |
| tree | e52e626bc8edc9ea68eb48ad2e8ec517ee997d33 /conf | |
| parent | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (diff) | |
| download | hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.gz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.bz2 hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.xz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.zip | |
Merged conflicts.
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 --------------- |