From 4600a6eb87e013839837626b4de192222a831ef1 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 8 Dec 2017 14:07:33 -0500
Subject: [PATCH] Update drinks.dm

---
 code/modules/food_and_drinks/drinks/drinks.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 4c19843a21..7217fe0b28 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -440,15 +440,9 @@
 	list_reagents = list("lemon_lime" = 30)
 	foodtype = FRUIT
 
-<<<<<<< HEAD
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/New()
-	..()
-	name = "Lemon-Lime Soda"
-=======
 /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize()
 	. = ..()
 	name = "lemon-lime soda"
->>>>>>> eddf889... Merge pull request #33341 from ShizCalev/31-bottles-of-beer
 
 /obj/item/reagent_containers/food/drinks/soda_cans/space_up
 	name = "Space-Up!"