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 /doc/sample/npc_extend_shop.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 'doc/sample/npc_extend_shop.txt')
| -rw-r--r-- | doc/sample/npc_extend_shop.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/sample/npc_extend_shop.txt b/doc/sample/npc_extend_shop.txt index ccc2ce5bb..1ca4ed7b8 100644 --- a/doc/sample/npc_extend_shop.txt +++ b/doc/sample/npc_extend_shop.txt @@ -27,4 +27,4 @@ prontera,146,229,5 shop Armor Card Merchant 80,4003:100000,4008:100000,4011:1000 prontera,144,227,5 shop Shield Card Merchant 80,4013:100000,4032:100000,4058:100000,4059:100000,4066:100000,4074:100000,4083:100000,4120:100000,4124:100000,4136:100000,4138:100000,4045:100000,4067:100000,4075:100000,4090:100000 prontera,142,225,5 shop Robe Card Merchant 80,4056:100000,4071:100000,4081:100000,4095:100000,4108:100000,4109:100000,4113:100000,4116:100000,4133:100000,4015:100000,4088:100000,4102:100000,4129:100000 prontera,140,223,5 shop Shoes Card Merchant 80,4009:100000,4038:100000,4050:100000,4070:100000,4097:100000,4100:100000,4107:100000 -prontera,138,221,5 shop Accessory Card Merchant 80,4022:100500,4027:100500,4028:100500,4034:100500,4051:100500,4064:100500,4091:100500,4079:100500,4033:100500,4040:100500,4044:100500,4048:100500,4053:100500,4073:100500,4077:100500,4084:100500,4093:100500,4103:100500,4139:100500
\ No newline at end of file +prontera,138,221,5 shop Accessory Card Merchant 80,4022:100500,4027:100500,4028:100500,4034:100500,4051:100500,4064:100500,4091:100500,4079:100500,4033:100500,4040:100500,4044:100500,4048:100500,4053:100500,4073:100500,4077:100500,4084:100500,4093:100500,4103:100500,4139:100500 |