diff options
| author | Reid <reidyaro@gmail.com> | 2011-12-29 00:13:53 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2011-12-29 00:13:53 +0100 |
| commit | 3fa8ab2cd804a023205b133e7efa9a20504b1839 (patch) | |
| tree | 4e572d82a353d572477ccb67c7b6cfc2f3a1789b /npc/000-0-0 | |
| parent | e249e6d5d7c75720486bb85f1ec9c4ae4ec4444b (diff) | |
| parent | ebc2b545ef01321b42f2c14f65ed3e466733d960 (diff) | |
| download | serverdata-3fa8ab2cd804a023205b133e7efa9a20504b1839.tar.gz serverdata-3fa8ab2cd804a023205b133e7efa9a20504b1839.tar.bz2 serverdata-3fa8ab2cd804a023205b133e7efa9a20504b1839.tar.xz serverdata-3fa8ab2cd804a023205b133e7efa9a20504b1839.zip | |
Merge branch 'master' of gitorious.org:evol/serverdata-beta
Conflicts:
npc/000-0-0/_import.txt
Diffstat (limited to 'npc/000-0-0')
| -rw-r--r-- | npc/000-0-0/_import.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/npc/000-0-0/_import.txt b/npc/000-0-0/_import.txt index 32699697..8f729fa7 100644 --- a/npc/000-0-0/_import.txt +++ b/npc/000-0-0/_import.txt @@ -1,8 +1,5 @@ map: 000-0-0.gat npc: npc/000-0-0/_mobs.txt npc: npc/000-0-0/_warps.txt -<<<<<<< HEAD npc: npc/000-0-0/mapflags.txt -======= ->>>>>>> ebc2b545ef01321b42f2c14f65ed3e466733d960 npc: npc/000-0-0/intro.txt |