Update job.dm

2017-11-09 03:21:45 -06:00
parent eb54055278
commit 2c6fc293f4
1 changed files with 0 additions and 3 deletions
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -72,15 +72,12 @@

 	H.dna.species.after_equip_job(src, H, visualsOnly)

-<<<<<<< HEAD
-=======
 	if(CONFIG_GET(flag/enforce_human_authority) && (title in GLOB.command_positions))
 		if(H.dna.species.id != "human")
 			H.set_species(/datum/species/human)
 			H.rename_self("human", H.client)
 		purrbation_remove(H, silent=TRUE)

->>>>>>> b5e0746... Refactor of catpeople mutant organs (#32101)
 	if(!visualsOnly && announce)
 		announce(H)