Update life.dm

code/modules/mob/living/simple_animal/slime/life.dm

@@ -338,9 +338,6 @@
 
 					if(L in Friends) // No eating friends!
 						continue
-
-<<<<<<< HEAD
-=======
 					var/ally = FALSE
 					for(var/F in faction)
 						if(F == "neutral") //slimes are neutral so other mobs not target them, but they can target neutral mobs
@@ -350,8 +347,6 @@
 							break
 					if(ally)
 						continue
-
->>>>>>> 389e21e... Fixes slimes not attacking anybody (#34667)
 					if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence
 						targets += L // Possible target found!