diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2011-01-05 17:23:33 +0100 |
|---|---|---|
| committer | Stefan Beller <stefanbeller@googlemail.com> | 2011-01-05 17:42:12 +0100 |
| commit | 28f9091d1d8819808f145dbbb08cf95af8139d29 (patch) | |
| tree | 28c1e37d6dc90e12c95209b73306602be814738e /npc/027-2_Caretakers_House/_import.txt | |
| parent | dc7c0909908eea9428960a82e76815cf1912a5d9 (diff) | |
| download | serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.tar.gz serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.tar.bz2 serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.tar.xz serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.zip | |
repair the repo.
- removing the <<<<====>>>> unsolved merge conflicts
- reset some files, which are using CRLF(windows style) line ending to LF only (unix style)
- adding some comments to the csv files to not edit them manually but to use nice programs
Diffstat (limited to 'npc/027-2_Caretakers_House/_import.txt')
| -rw-r--r-- | npc/027-2_Caretakers_House/_import.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/npc/027-2_Caretakers_House/_import.txt b/npc/027-2_Caretakers_House/_import.txt index e288d6cb..f548a434 100644 --- a/npc/027-2_Caretakers_House/_import.txt +++ b/npc/027-2_Caretakers_House/_import.txt @@ -1,7 +1,8 @@ -map: 027-2.gat
-npc: npc/027-2_Caretakers_House/_mobs.txt
-npc: npc/027-2_Caretakers_House/_warps.txt
-npc: npc/027-2_Caretakers_House/caretaker.txt
-npc: npc/027-2_Caretakers_House/alacrius.txt
-npc: npc/027-2_Caretakers_House/gy_inn_shops.txt
-npc: npc/027-2_Caretakers_House/testnpcs.txt
\ No newline at end of file +map: 027-2.gat +npc: npc/027-2_Caretakers_House/_mobs.txt +npc: npc/027-2_Caretakers_House/_warps.txt +npc: npc/027-2_Caretakers_House/alacrius.txt +npc: npc/027-2_Caretakers_House/alacrius2.txt +npc: npc/027-2_Caretakers_House/caretaker.txt +npc: npc/027-2_Caretakers_House/gy_inn_shops.txt +npc: npc/027-2_Caretakers_House/testnpcs.txt |