From 0023e7de1c23638349e2f4e6e425676ea6ef2ac7 Mon Sep 17 00:00:00 2001
From: "Zuzanna K. Filutowska" <platyna@users.sourceforge.net>
Date: Sun, 21 Jan 2007 16:32:40 +0000
Subject: Fixed double definition of Ishyah.

---
 npc/cave1/miners.txt            | 2 --
 npc/western-desert/merchant.txt | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'npc')

diff --git a/npc/cave1/miners.txt b/npc/cave1/miners.txt
index 30231f82..d3a17b52 100644
--- a/npc/cave1/miners.txt
+++ b/npc/cave1/miners.txt
@@ -5,8 +5,6 @@ new_2-1.gat,35,35,6	script	Nathan	109,{
 	close;
 }
 
-new_1-1.gat,19,99,0	shop	Ishyah	109,525:800,531:3000,530:8000,1199:2
-
 new_5-1.gat,32,94,6	script	Naem	109,{
 	mes "[Naem the Miner]";
 	mes "Do you want me to lift you to the upper level?";
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
-- 
cgit v1.2.3-70-g09d2