mc resolve

Fluffy-Frontier · Nov 23, 2023 · bfd0f5a · bfd0f5a
1 parent da12a98
commit bfd0f5a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
@@ -286,11 +286,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NO_JUMPSUIT" = TRAIT_NO_JUMPSUIT,
 		"TRAIT_NO_MINDSWAP" = TRAIT_NO_MINDSWAP,
 		"TRAIT_NO_MIRROR_REFLECTION" = TRAIT_NO_MIRROR_REFLECTION,
-<<<<<<< HEAD
 		//"TRAIT_NO_PLASMA_TRANSFORM" = TRAIT_NO_PLASMA_TRANSFORM, SKYRAT EDIT - TODO - These require transformation sting pr
-=======
-		"TRAIT_NO_PLASMA_TRANSFORM" = TRAIT_NO_PLASMA_TRANSFORM,
->>>>>>> 8d9a35a4f (Adds our traits define file to the linter steps (#25134))
 		"TRAIT_NO_SLIP_ALL" = TRAIT_NO_SLIP_ALL,
 		"TRAIT_NO_SLIP_ICE" = TRAIT_NO_SLIP_ICE,
 		"TRAIT_NO_SLIP_SLIDE" = TRAIT_NO_SLIP_SLIDE,