From ec230d1eb8212f4c5b8e551e4fb4cd0b638ed637 Mon Sep 17 00:00:00 2001
From: brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 9 Aug 2012 18:01:21 +0000
Subject: - Added svn:eol-style=native property on some recently added text
 files. - Renamed upgrade_svn16517.sql to the correct SVN revision it was
 added in (r16518).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16614 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/pre-re/merchants/shops.txt | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'npc/pre-re/merchants')

diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index 88da72675..d8fd1d96a 100644
--- a/npc/pre-re/merchants/shops.txt
+++ b/npc/pre-re/merchants/shops.txt
@@ -1,21 +1,21 @@
-//===== rAthena Script ======================================= 
-//= Shops
-//===== By: ================================================== 
-//= Daegaladh
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= Pre-renewal-specific town shop NPCs.
-//===== Additional Comments: ================================= 
-//= 1.0 First version.
-//============================================================ 
-
-//=======================================================
-// Izlude
-//=======================================================
-izlude,105,99,0	shop	Butcher#iz	54,517:-1
-izlude,94,98,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
-izlude,105,92,7	shop	Vendor from Milk Ranch#i	90,519:-1
-izlude,164,138,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+//===== rAthena Script ======================================= 
+//= Shops
+//===== By: ================================================== 
+//= Daegaladh
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Pre-renewal-specific town shop NPCs.
+//===== Additional Comments: ================================= 
+//= 1.0 First version.
+//============================================================ 
+
+//=======================================================
+// Izlude
+//=======================================================
+izlude,105,99,0	shop	Butcher#iz	54,517:-1
+izlude,94,98,4	shop	Fruit Gardener#iz	53,512:-1,513:-1,515:-1,516:-1
+izlude,105,92,7	shop	Vendor from Milk Ranch#i	90,519:-1
+izlude,164,138,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-- 
cgit v1.2.3-60-g2f50