summaryrefslogtreecommitdiff
path: root/npc/scripts_warps.conf
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
committershennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
commit7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch)
tree715f3b80d75cab3a9c2a3abd04ae4461165e8854 /npc/scripts_warps.conf
parenta2405882a4123d6a11d24e895b40148dc7cb455e (diff)
parentbd04c6c566902d03d633b4dfee5335361155a79e (diff)
downloadhercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/scripts_warps.conf')
-rw-r--r--npc/scripts_warps.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index 6f3a25558..4a42ccfa2 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -80,11 +80,10 @@ npc: npc/warps/fields/umbala_fild.txt
// --------------------------- Others ---------------------------
npc: npc/warps/other/airplane.txt
-npc: npc/warps/other/bossnia.txt
+npc: npc/warps/other/arena.txt
npc: npc/warps/other/god.txt
npc: npc/warps/other/jobquests.txt
npc: npc/warps/other/kiel.txt
npc: npc/warps/other/other.txt
-npc: npc/warps/other/arena.txt
npc: npc/warps/guildcastles.txt
npc: npc/warps/pvp.txt