Fix incoming mirror PR

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -69,16 +69,6 @@
 /datum/reagent/nutriment/coating/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 
 	//We'll assume that the batter isnt going to be regurgitated and eaten by someone else. Only show this once
-<<<<<<< HEAD
-	if (data["cooked"] != 1)
-		if (!messaged)
-			to_chat(M, "Ugh, this raw [name] tastes disgusting.")
-			nutriment_factor *= 0.5
-			messaged = 1
-
-		//Raw coatings will sometimes cause vomiting
-		if (prob(1))
-=======
 	if(data["cooked"] != 1)
 		if (!messaged)
 			to_chat(M, "<span class='warning'>Ugh, this raw [name] tastes disgusting.</span>")
@@ -87,7 +77,6 @@
 
 		//Raw coatings will sometimes cause vomiting. 75% chance of this happening.
 		if(prob(75))
->>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
 			M.vomit()
 	..()