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/debugroom_Woodland_mining_camp/_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/debugroom_Woodland_mining_camp/_import.txt')
| -rw-r--r-- | npc/debugroom_Woodland_mining_camp/_import.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/npc/debugroom_Woodland_mining_camp/_import.txt b/npc/debugroom_Woodland_mining_camp/_import.txt new file mode 100644 index 00000000..1a0603ae --- /dev/null +++ b/npc/debugroom_Woodland_mining_camp/_import.txt @@ -0,0 +1,3 @@ +map: debugroom.gat +npc: npc/debugroom_Woodland_mining_camp/_mobs.txt +npc: npc/debugroom_Woodland_mining_camp/_warps.txt |