Update datum_traitor.dm

code/datums/antagonists/datum_traitor.dm

@@ -174,26 +174,11 @@
 
 	if(prob(30))
 		objective_count += forge_single_objective()
-
-<<<<<<< HEAD
-	for(var/i = objective_count, i < config.traitor_objectives_amount, i++)
-		if(prob(20)) //AI's are less likely to look for a late-joiner than normal traitors
-			var/datum/objective/assassinate/late/late_objective = new
-			late_objective.owner = owner
-			late_objective.find_target()
-			add_objective(late_objective)
-		else
-			var/datum/objective/assassinate/kill_objective = new
-			kill_objective.owner = owner
-			kill_objective.find_target()
-			add_objective(kill_objective)
-=======
 	for(var/i = objective_count, i < CONFIG_GET(number/traitor_objectives_amount), i++)
 		var/datum/objective/assassinate/kill_objective = new
 		kill_objective.owner = owner
 		kill_objective.find_target()
 		add_objective(kill_objective)
->>>>>>> 4178c20... Configuration datum refactor (#30763)
 
 	var/datum/objective/survive/exist/exist_objective = new
 	exist_objective.owner = owner