mergening boogaloo

shiptest-ss13 · Nov 15, 2023 · 02f3598 · 02f3598
1 parent 2912e4c
commit 02f3598
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
@@ -90,7 +90,6 @@
 	glasses = /obj/item/clothing/glasses/sunglasses
 	alt_suit = null
 
-<<<<<<< HEAD
 /datum/outfit/job/captain/syndicate
 	name = "Captain (ACLF)"
 	id = /obj/item/card/id/syndicate_command/captain_id
@@ -156,8 +155,6 @@
 	gloves = /obj/item/clothing/gloves/combat
 	suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
 
-=======
->>>>>>> upstream/master
 /datum/outfit/job/captain/minutemen
 	name = "Captain (Colonial Minutemen)"