From de9641edaefd7a6cc62644d6cebd21e9a053d580 Mon Sep 17 00:00:00 2001
From: MMMiracles <lolaccount1@hotmail.com>
Date: Thu, 19 Mar 2015 19:35:02 -0400
Subject: [PATCH] seriously where did these lines come from

---
 code/modules/food&drinks/food/snacks_burgers.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/food&drinks/food/snacks_burgers.dm b/code/modules/food&drinks/food/snacks_burgers.dm
index 633940afb54..9f77bfce846 100644
--- a/code/modules/food&drinks/food/snacks_burgers.dm
+++ b/code/modules/food&drinks/food/snacks_burgers.dm
@@ -55,15 +55,12 @@
 	desc = "Smells caustic. Tastes like heresy."
 	icon_state = "xburger"
 	bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
-<<<<<<< HEAD
 
 /obj/item/weapon/reagent_containers/food/snacks/burger/bearger
 	name = "bearger"
 	desc = "Best served rawr."
 	icon_state = "bearger"
 	bonus_reagents = list("nutriment" = 3, "vitamin" = 6)
-=======
->>>>>>> b5979a49fe43e9e059e6c165b309df0b1c018087
 
 /obj/item/weapon/reagent_containers/food/snacks/burger/clown
 	name = "clown burger"