From 8001530014f46f14c58396cd324e7d7b5e3222ef Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Fri, 28 Dec 2012 17:18:39 +0100
Subject: Correct some merge issue.

---
 db/const.txt     | 4 ++--
 db/questvars.txt | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'db')

diff --git a/db/const.txt b/db/const.txt
index 11f40816..5bdb0019 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -208,8 +208,8 @@ ShipQuests_Nard			4
 ShipQuests_Knife		5
 ShipQuests_ArpanMoney		6
 ShipQuests_Door			7
-ShipQuests_TreasureChest		8
-ShipQuests_Couwan		9
+ShipQuests_Couwan		8
+ShipQuests_TreasureChest		9
 ShipQuests_Ale			10
 ShipQuests_Astapolos		11
 ShipQuests_Gulukan		12
diff --git a/db/questvars.txt b/db/questvars.txt
index 26b181ed..8c93f856 100644
--- a/db/questvars.txt
+++ b/db/questvars.txt
@@ -15,13 +15,8 @@ ShipQuests,15,32768     // ShipQuests_Nard             4
 ShipQuests,1,1024       // ShipQuests_Knife            5
 ShipQuests,1,2048       // ShipQuests_ArpanMoney       6
 ShipQuests,1,4096       // ShipQuests_Door             7
-<<<<<<< HEAD
-ShipQuests,3,8192       // ShipQuests_TreasureChest    8
-ShipQuests,1,524288     // ShipQuests_Couwan           9
-=======
-ShipQuests,3,8192       // ShipQuests_Darlin           8
-ShipQuests,3,524288     // ShipQuests_Couwan           9
->>>>>>> parent of 6db8b93... Correct bugs.
+ShipQuests,3,8192       // ShipQuests_Couwan           8
+ShipQuests,1,524288     // ShipQuests_TreasureChest    9
 ShipQuests,1,1048576    // ShipQuests_Ale              10
 ShipQuests,1,2097152    // ShipQuests_Astapolos        11
 ShipQuests,1,4194304    // ShipQuests_Gulukan          12
-- 
cgit v1.2.3-70-g09d2