Update tgstation.dme

This commit is contained in:
LetterJay
2017-09-30 02:56:33 -05:00
committed by GitHub
parent d7db5f23cb
commit 0987619a55
-2
View File
@@ -193,7 +193,6 @@
#include "code\controllers\admin.dm"
#include "code\controllers\configuration.dm"
#include "code\controllers\configuration_citadel.dm"
=======
#include "code\controllers\configuration\entries\comms.dm"
#include "code\controllers\configuration\entries\config.dm"
#include "code\controllers\configuration\entries\dbconfig.dm"
@@ -201,7 +200,6 @@
#include "code\controllers\configuration\config_entry.dm"
#include "code\controllers\configuration\configuration.dm"
#include "code\controllers\admin.dm"
>>>>>>> 4178c20... Configuration datum refactor (#30763)
#include "code\controllers\controller.dm"
#include "code\controllers\failsafe.dm"
#include "code\controllers\globals.dm"