summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorSaulc <lucashelaine14@gmail.com>2018-02-07 22:26:19 +0100
committerSaulc <lucashelaine14@gmail.com>2018-02-07 22:26:19 +0100
commit7d449dc95b10543b595c273a3fc5244a0e92e837 (patch)
treea9206c2994989b2affddad63e8b416f6266d4fca /db
parent6d786005f794bf4e245e9b1b3ad7cf4b6cee9429 (diff)
downloadserverdata-7d449dc95b10543b595c273a3fc5244a0e92e837.tar.gz
serverdata-7d449dc95b10543b595c273a3fc5244a0e92e837.tar.bz2
serverdata-7d449dc95b10543b595c273a3fc5244a0e92e837.tar.xz
serverdata-7d449dc95b10543b595c273a3fc5244a0e92e837.zip
fix quest.db and add Fishing in Tulimshar 003-1
Diffstat (limited to 'db')
-rw-r--r--db/quest_db.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 45bff12b6..1bd0a2d63 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -115,7 +115,7 @@ quest_db: (
},
{
Id: 22
- Name: "ArtisQuests_Fishman"
+ Name: "TulimsharQuests_Fishman"
},
{
Id: 23
@@ -179,11 +179,11 @@ quest_db: (
},
{
Id: 38
-<<<<<<< HEAD
Name: "CandorQuest_Maya"
-=======
- Name: "ArtisQuest_Apana"
->>>>>>> 35753b2705a52c648a61a11d175dcc93a31bc3f5
+},
+{
+ Id: 39
+ Name: "CandorQuest_Apana"
},
{
Id: 1000