summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-07-03 21:12:38 -0300
committershennetsind <ind@henn.et>2013-07-03 21:12:38 -0300
commit987bfa3c05b2e76779e861057b8eea8e7e066570 (patch)
tree3c3789ce7d94065be3022288886c6f48f442f5a7
parent5bac8798519fa02c5f5d9114295e9ebbee865f82 (diff)
parent0cdae21d63836deeb99ae5376090828a6478a6d9 (diff)
downloadhercules-987bfa3c05b2e76779e861057b8eea8e7e066570.tar.gz
hercules-987bfa3c05b2e76779e861057b8eea8e7e066570.tar.bz2
hercules-987bfa3c05b2e76779e861057b8eea8e7e066570.tar.xz
hercules-987bfa3c05b2e76779e861057b8eea8e7e066570.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
-rw-r--r--npc/re/scripts.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf
index d7d449c1a..e3b683a34 100644
--- a/npc/re/scripts.conf
+++ b/npc/re/scripts.conf
@@ -65,7 +65,7 @@ npc: npc/re/merchants/quivers.txt
npc: npc/re/merchants/refine.txt
npc: npc/re/merchants/renters.txt
npc: npc/re/merchants/shops.txt
-npc: npc/re/ticket_refiner.txt
+npc: npc/re/merchants/ticket_refiner.txt
npc: npc/re/merchants/enchan_mal.txt
npc: npc/re/merchants/enchan_mora.txt
npc: npc/re/merchants/coin_exchange.txt