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/cities/malaya.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/cities/malaya.txt')
| -rw-r--r-- | npc/re/cities/malaya.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index dd5ca3101..30a38cf4d 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -1763,4 +1763,4 @@ malaya,257,58,6 script Jeepney Driver#09 582,{ "Since everybody have different tastes, you can see those with cool and elaborate decorations.", "Of course you don't need to drive them yourselves, but you can ride them so please feel free to do so." ); -}
\ No newline at end of file +} |