diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/002-1/merchant.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/002-1/merchant.txt')
| -rw-r--r-- | world/map/npc/002-1/merchant.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/world/map/npc/002-1/merchant.txt b/world/map/npc/002-1/merchant.txt deleted file mode 100644 index b1b2c3fd..00000000 --- a/world/map/npc/002-1/merchant.txt +++ /dev/null @@ -1,3 +0,0 @@ -// - -002-1.gat,19,99,0|shop|Ishyah|109,MinersHat :-1,MinerGloves :-1,ShortBow :-1,Arrow :-1,LeatherShield :-1 |