dme

Fluffy-Frontier · Nov 20, 2023 · 6853956 · 6853956
1 parent edb26d1
commit 6853956
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/tgstation.dme b/tgstation.dme
@@ -371,7 +371,10 @@
 #include "code\__DEFINES\research\anomalies.dm"
 #include "code\__DEFINES\research\research_categories.dm"
 #include "code\__DEFINES\research\slimes.dm"
-<<<<<<< HEAD
+#include "code\__DEFINES\traits\_traits.dm"
+#include "code\__DEFINES\traits\declarations.dm"
+#include "code\__DEFINES\traits\macros.dm"
+#include "code\__DEFINES\traits\sources.dm"
 #include "code\__DEFINES\~ff_defines\DNA.dm"
 #include "code\__DEFINES\~ff_defines\nabber_clothes_pathes.dm"
 #include "code\__DEFINES\~ff_defines\say.dm"
@@ -381,12 +384,6 @@
 #include "code\__DEFINES\~ff_defines\__HELPERS\global_lists.dm"
 #include "code\__DEFINES\~ff_defines\__HELPERS\ishelpers.dm"
 #include "code\__DEFINES\~ff_defines\__HELPERS\names.dm"
-=======
-#include "code\__DEFINES\traits\_traits.dm"
-#include "code\__DEFINES\traits\declarations.dm"
-#include "code\__DEFINES\traits\macros.dm"
-#include "code\__DEFINES\traits\sources.dm"
->>>>>>> 17cba0dcc ([MISSED MIRROR] Puts all traits in the globalvars file + CI Testing (#79642) (#25131))
 #include "code\__DEFINES\~skyrat_defines\_organ_defines.dm"
 #include "code\__DEFINES\~skyrat_defines\access.dm"
 #include "code\__DEFINES\~skyrat_defines\actionspeed_modification.dm"