diff options
| author | nmaligec <wouldnot@hotmail.com> | 2011-01-05 00:34:26 -0500 |
|---|---|---|
| committer | nmaligec <wouldnot@hotmail.com> | 2011-01-05 00:34:26 -0500 |
| commit | ed8cac19500c515cae40c1fd4b2d87abd96ae3ba (patch) | |
| tree | 3136c4b4bac4db3a432384390efcc22f88ff2790 /npc/027-2_Caretakers_House/_warps.txt | |
| parent | 21156bed9c3d6eb3cf66a1e1557f4fc8c87a4194 (diff) | |
| parent | 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b (diff) | |
| download | serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.gz serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.bz2 serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.xz serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.zip | |
merging updates from previous test repo ta-testing.
Diffstat (limited to 'npc/027-2_Caretakers_House/_warps.txt')
| -rw-r--r-- | npc/027-2_Caretakers_House/_warps.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/npc/027-2_Caretakers_House/_warps.txt b/npc/027-2_Caretakers_House/_warps.txt index c1bfeb92..160e4dae 100644 --- a/npc/027-2_Caretakers_House/_warps.txt +++ b/npc/027-2_Caretakers_House/_warps.txt @@ -1,5 +1,6 @@ // 027-2 Caretaker's House warps +<<<<<<< HEAD 027-2.gat,25,32 warp toGraveyard -1,-1,027-1.gat,88,85 @@ -18,3 +19,6 @@ 027-2.gat,75,93,0 warp ToInnFirstFloorL -1,-1,027-2.gat,127,36 027-2.gat,76,93,0 warp ToInnFirstFloorR -1,-1,027-2.gat,128,36 +======= +027-2.gat,26,33 warp toGraveyard -1,-1,027-1.gat,88,85 +>>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b |