diff options
Diffstat (limited to 'db/quest_db.conf')
| -rw-r--r-- | db/quest_db.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/db/quest_db.conf b/db/quest_db.conf index 192f4a61b..45bff12b6 100644 --- a/db/quest_db.conf +++ b/db/quest_db.conf @@ -179,7 +179,11 @@ quest_db: ( }, { Id: 38 +<<<<<<< HEAD + Name: "CandorQuest_Maya" +======= Name: "ArtisQuest_Apana" +>>>>>>> 35753b2705a52c648a61a11d175dcc93a31bc3f5 }, { Id: 1000 |