Resolves Rouge code

cmss13-devs · Dec 2, 2024 · bbeb2ea · bbeb2ea
1 parent 42ac53c
commit bbeb2ea
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
@@ -2884,10 +2884,10 @@
 
 /datum/equipment_preset/upp/officer/ley_gen
 	name = "UPP General Polkovnik (Cryo)"
-=======
+
 /datum/equipment_preset/upp/officer/flag/ley_gen/dressed
 	name = "UPP General Polkovnik"
->>>>>>> master
+
 	assignment = JOB_UPP_LT_GENERAL
 	rank = JOB_UPP_LT_GENERAL
 	role_comm_title = "Lt. Gen."