diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
| commit | 29f4963673b1f793448a083a21be3e6ae4d69c54 (patch) | |
| tree | 8722f2e506fc7ba97070a79739f819f0ade4f03d /npc/re/scripts.conf | |
| parent | fb82e87c39227921fc3397a8763f0bdb0921a28b (diff) | |
| parent | 7b1293c3caf76b5587aa3abe8df57b1083c2175d (diff) | |
| download | hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.gz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.bz2 hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.xz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc/re/scripts.conf')
| -rw-r--r-- | npc/re/scripts.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf index b498960f1..e0c12c2e5 100644 --- a/npc/re/scripts.conf +++ b/npc/re/scripts.conf @@ -93,7 +93,6 @@ npc: npc/re/merchants/ninja_craftsman.txt // --------------------------- Others --------------------------- npc: npc/re/other/bulletin_boards.txt -//npc: npc/re/other/item_merge.txt npc: npc/re/other/mail.txt npc: npc/re/other/mercenary_rent.txt npc: npc/re/other/pvp.txt |