From 3a9791f0c95380e34ca4a123b13e0b671e2e6c5b Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 10 Apr 2021 09:54:48 -0400
Subject: [PATCH] Update Chemistry-Reagents-Food-Drinks.dm

---
 .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index d2bc5727555..a921f410640 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -4156,8 +4156,6 @@
 	reagent_state = LIQUID
 	nutriment_factor = 40 //very filling
 	color = "#d169b2"
-<<<<<<< HEAD
-=======
 
 //ADDITIONS BELOW THIS LINE MADE ON 04/03/2021
 
@@ -4183,4 +4181,3 @@
 	nutriment_factor = 2
 	glass_name = "kvass"
 	glass_desc = "A hearty glass of Slavic brew."
->>>>>>> a0ff9a0... Boda Tweaks and Russian Drinks V2 (#8023)