diff options
Diffstat (limited to 'npc/mobs')
| -rw-r--r-- | npc/mobs/citycleaners.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt index 876017fd4..62a0f2c12 100644 --- a/npc/mobs/citycleaners.txt +++ b/npc/mobs/citycleaners.txt @@ -47,4 +47,8 @@ einbech,0,0,0,0 monster Tarou 1175,5,1800000,1500000,0 //================================================== payon_in02,23,68,5,5 monster Thief Bug Egg 1048,7,1200000,600000,0 +<<<<<<< HEAD job3_war01,19,33,5,5 monster Thief Bug Egg 1213,1,12,60,0 +======= +job3_war01,19,33,5,5 monster Thief Bug Egg 1048,1,12,60,0 +>>>>>>> upstream/master |