From 5c5b78dc8c26ae02a1b8245a8398c8cffdb314f3 Mon Sep 17 00:00:00 2001
From: Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 27 Jul 2006 10:40:29 +0000
Subject: Fixed the Morroc ingredient seller to not appear

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7911 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt       | 1 +
 npc/merchants/shops.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index cbf1260f8..96a8c3059 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -39,6 +39,7 @@ Playtester
 Date		Added
 ======
 07/27
+	* Fixed the Morroc ingredient seller to not appear [Playtester]
 	* Fixed some spawns and a warp in Sunken Ship [Playtester]
 07/26
 	* Fixed the Factory Quest [Playtester]
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 0e391b382..3e2ad76d8 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -210,7 +210,7 @@ morocc.gat,244,134,1	shop	Trader	93,2612:-1
 morocc.gat,259,193,1	shop	Trader	99,747:-1
 morocc.gat,268,193,1	shop	Trader	93,748:-1
 morocc.gat,269,167,4	shop	Pet Merchant	125,537:-1,643:-1,10013:-1,10014:-1
-morocc.gat,120,97,5	shop	Ingredient Seller	86,7452,:-,7453:-1,7454:-1,7455:-1,7456:-1
+morocc.gat,120,97,5	shop	Ingredient Seller	86,7452:-1,7453:-1,7454:-1,7455:-1,7456:-1
 //morocc_in.gat,65,37,4	shop	Miner	48,1010:-1,1011:-1
 morocc_in.gat,132,57,0	shop	Weapon Dealer	99,1146:-1,1245:-1
 
-- 
cgit v1.2.3-70-g09d2