From bbe1d901a780f462347037c30856393caa5983a3 Mon Sep 17 00:00:00 2001
From: Saulc <lucashelaine14@gmail.com>
Date: Wed, 29 Aug 2018 09:05:15 +0000
Subject: Revert "Merge branch 'master' into 'master'"

This reverts commit 5f62243a1da032521de53876005112d5e6e36a19
---
 npc/007-1/_import.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'npc/007-1/_import.txt')

diff --git a/npc/007-1/_import.txt b/npc/007-1/_import.txt
index 79c6fdd2e..aeedae88a 100644
--- a/npc/007-1/_import.txt
+++ b/npc/007-1/_import.txt
@@ -2,4 +2,9 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/007-1/_mobs.txt",
 "npc/007-1/_warps.txt",
+"npc/007-1/caelum.txt",
+"npc/007-1/dracoula.txt",
+"npc/007-1/pylon.txt",
+"npc/007-1/torches.txt",
 "npc/007-1/tycoon.txt",
+"npc/007-1/zarkor.txt",
-- 
cgit v1.2.3-60-g2f50