summaryrefslogtreecommitdiff
path: root/npc/re/scripts.conf
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/scripts.conf')
-rw-r--r--npc/re/scripts.conf1
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