diff options
| author | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-16 08:12:48 -0300 |
| commit | 5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7 (patch) | |
| tree | da13821a29480d88dcd872c682b26b75e5191482 /npc/re/merchants/3rd_trader.txt | |
| parent | 4eb223b62e70a293dd2c95f1ce8b29a3f0c83ef7 (diff) | |
| parent | fe2f840e5d6cb4230ba02c47132790d067b3814d (diff) | |
| download | hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.gz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.bz2 hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.xz hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Solved minor conflicts that were caused by the unit interface
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'npc/re/merchants/3rd_trader.txt')
| -rw-r--r-- | npc/re/merchants/3rd_trader.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index 7c3ca3cac..86dd01656 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -225,4 +225,4 @@ gef_tower,105,172,5 script Point Salesman#Sorcerer::pss 700,{ } comodo,241,103,6 duplicate(pss) Point Salesman#1 700 alberta,105,52,7 duplicate(pss) Point Salesman#2 700 -veins,202,128,6 duplicate(pss) Point Salesman#3 700
\ No newline at end of file +veins,202,128,6 duplicate(pss) Point Salesman#3 700 |