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/other/mercenary_rent.txt | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

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

diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt
index 29e75a952..c45fa7b8b 100644
--- a/npc/pre-re/other/mercenary_rent.txt
+++ b/npc/pre-re/other/mercenary_rent.txt
@@ -1,17 +1,17 @@
-//===== rAthena Script =======================================
-//= Mercenary related NPCs
-//===== By: ==================================================
-//= Daegaladh
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= Sells Lancer, Sword, and Archer mercenaries,
-//= along with related mercenary items.
-//===== Additional Comments: =================================
-//= 1.0 First version. [Daegaladh]
-//============================================================
-
-izlude,47,139,5	duplicate(Mercenary_Manager_Sword)	Mercenary Manager#Sword	734
-izlude,56,139,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
+//===== rAthena Script =======================================
+//= Mercenary related NPCs
+//===== By: ==================================================
+//= Daegaladh
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Sells Lancer, Sword, and Archer mercenaries,
+//= along with related mercenary items.
+//===== Additional Comments: =================================
+//= 1.0 First version. [Daegaladh]
+//============================================================
+
+izlude,47,139,5	duplicate(Mercenary_Manager_Sword)	Mercenary Manager#Sword	734
+izlude,56,139,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
-- 
cgit v1.2.3-70-g09d2