diff options
| author | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
| commit | 093193bd26b87f6afc876fd96b46271bd4e2ed81 (patch) | |
| tree | e52e626bc8edc9ea68eb48ad2e8ec517ee997d33 /npc | |
| parent | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (diff) | |
| download | hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.gz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.bz2 hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.xz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.zip | |
Merged conflicts.
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/mobs/citycleaners.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt index 62a0f2c12..749efed85 100644 --- a/npc/mobs/citycleaners.txt +++ b/npc/mobs/citycleaners.txt @@ -47,8 +47,4 @@ 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 |