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_shop_test.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_shop_test.txt')
-rw-r--r-- | doc/sample/npc_shop_test.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/sample/npc_shop_test.txt b/doc/sample/npc_shop_test.txt index fa58f3f52..5e492b257 100644 --- a/doc/sample/npc_shop_test.txt +++ b/doc/sample/npc_shop_test.txt @@ -37,4 +37,4 @@ prontera,218,211,4 shop Pet Groomer 125,537:2500,643:3000,10013:1500,10014:2000 izlude,164,138,4 shop Pet Groomer 124,537:2500,643:3000,10013:1500,10014:2000 morocc,269,167,4 shop Pet Groomer 125,537:2500,643:3000,10013:1500,10014:2000 geffen,193,152,4 shop Pet Groomer 124,537:2500,643:3000,10013:1500,10014:2000 -payon,142,104,4 shop Pet Groomer 124,537:2500,643:3000,10013:1500,10014:2000
\ No newline at end of file +payon,142,104,4 shop Pet Groomer 124,537:2500,643:3000,10013:1500,10014:2000 |