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/warps/other/s_workshop.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/warps/other/s_workshop.txt')
| -rw-r--r-- | npc/re/warps/other/s_workshop.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/re/warps/other/s_workshop.txt b/npc/re/warps/other/s_workshop.txt index bc04509b3..3f50edb6b 100644 --- a/npc/re/warps/other/s_workshop.txt +++ b/npc/re/warps/other/s_workshop.txt @@ -28,4 +28,4 @@ s_atelier,80,66,0 warp s_atelier0012 1,1,s_atelier,32,56 s_atelier,109,129,0 warp s_atelier0013 1,1,s_atelier,159,125 s_atelier,160,130,0 warp s_atelier0014 1,1,s_atelier,114,129 yuno,278,66,0 warp s_atelier0015 1,1,s_atelier,111,122 -s_atelier,107,122,0 warp s_atelier0016 1,1,yuno,274,66
\ No newline at end of file +s_atelier,107,122,0 warp s_atelier0016 1,1,yuno,274,66 |