diff options
Diffstat (limited to 'db')
| -rw-r--r-- | db/quest_db.conf | 10 |
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 |