diff options
| -rw-r--r-- | world/map/db/mob_db.conf | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf index dab9706c..09a82978 100644 --- a/world/map/db/mob_db.conf +++ b/world/map/db/mob_db.conf @@ -148,11 +148,7 @@ mob_db: ( Dagger: 70 SharpKnife: 10 PileOfAsh: 500 -<<<<<<< HEAD - BromenalDroplet: 20 -======= BromenalDroplet: 20 ->>>>>>> 63187407 (mob drops) } }, { @@ -1363,11 +1359,7 @@ mob_db: ( Dagger: 70 SharpKnife: 10 PileOfAsh: 500 -<<<<<<< HEAD - BromenalDroplet: 30 -======= BromenalDroplet: 30 ->>>>>>> 63187407 (mob drops) } }, { @@ -3192,12 +3184,8 @@ mob_db: ( IronOre: 1000 PileOfAsh: 1000 Coal: 1000 -<<<<<<< HEAD BromenalDroplet: 200 BromenalDroplet: 100 -======= - BromenalDroplet: 100 ->>>>>>> 63187407 (mob drops) TinyManaElixir: 500 } }, @@ -7356,11 +7344,7 @@ mob_db: ( TreasureKey: 1000 Coal: 300 SilverOre: 30 -<<<<<<< HEAD BromenalOre: 20 -======= - BromenalOre: 20 ->>>>>>> 63187407 (mob drops) GoldOre: 10 } }, @@ -7917,11 +7901,7 @@ mob_db: ( IronOre: 800 Coal: 1000 SilverOre: 150 -<<<<<<< HEAD BromenalOre: 100 -======= - BromenalOre: 100 ->>>>>>> 63187407 (mob drops) GoldOre: 50 } }, |