From e249e6d5d7c75720486bb85f1ec9c4ae4ec4444b Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Thu, 29 Dec 2011 00:12:11 +0100
Subject: Add back _import.txt .

---
 npc/000-0-0/_import.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/npc/000-0-0/_import.txt b/npc/000-0-0/_import.txt
index 8f729fa7..32699697 100644
--- a/npc/000-0-0/_import.txt
+++ b/npc/000-0-0/_import.txt
@@ -1,5 +1,8 @@
 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
-- 
cgit v1.2.3-70-g09d2