forgot to tick it

cmss13-devs · Nov 6, 2023 · bf3eb9c · bf3eb9c
1 parent de6875e
commit bf3eb9c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/colonialmarines.dme b/colonialmarines.dme
@@ -1767,6 +1767,7 @@
 #include "code\modules\logging\log_category.dm"
 #include "code\modules\logging\log_holder.dm"
 #include "code\modules\mapping\map_template.dm"
+#include "code\modules\mapping\merge_conflicts.dm"
 #include "code\modules\mapping\preloader.dm"
 #include "code\modules\mapping\reader.dm"
 #include "code\modules\mapping\verify.dm"