summaryrefslogtreecommitdiff
path: root/npc/western-desert
diff options
context:
space:
mode:
authorZuzanna K. Filutowska <platyna@users.sourceforge.net>2007-01-21 16:32:40 +0000
committerZuzanna K. Filutowska <platyna@users.sourceforge.net>2007-01-21 16:32:40 +0000
commit0023e7de1c23638349e2f4e6e425676ea6ef2ac7 (patch)
treeb0c54040d2993ea5811141d3aedcab272cc38204 /npc/western-desert
parentf0f5f12ee0686e0979e5982486044285f172bfed (diff)
downloadserverdata-0023e7de1c23638349e2f4e6e425676ea6ef2ac7.tar.gz
serverdata-0023e7de1c23638349e2f4e6e425676ea6ef2ac7.tar.bz2
serverdata-0023e7de1c23638349e2f4e6e425676ea6ef2ac7.tar.xz
serverdata-0023e7de1c23638349e2f4e6e425676ea6ef2ac7.zip
Fixed double definition of Ishyah.
Diffstat (limited to 'npc/western-desert')
-rw-r--r--npc/western-desert/merchant.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/western-desert/merchant.txt b/npc/western-desert/merchant.txt
index 77f63d49..456877e9 100644
--- a/npc/western-desert/merchant.txt
+++ b/npc/western-desert/merchant.txt
@@ -1 +1 @@
-new_1-1.gat,19,99,0 shop CaveShop 109,525:800,531:3000,530:8000,1199:5
+new_1-1.gat,19,99,0 shop Ishyah 109,525:800,531:3000,530:8000,1199:5