Update drink_reagents.dm

2018-05-13 10:15:57 -05:00
parent 34bf8d11aa
commit aee0160a25
1 changed files with 1 additions and 3 deletions
@@ -721,8 +721,7 @@
 	description = "Milk for cool kids."
 	color = "#7D4E29"
 	taste_description = "chocolate milk"
-<<<<<<< HEAD
-=======
+	
 /datum/reagent/consumable/menthol
 	name = "Menthol"
 	id = "menthol"
@@ -741,4 +740,3 @@
 	taste_description = "sweet pomegranates"
 	glass_name = "glass of grenadine"
 	glass_desc = "Delicious flavored syrup."
->>>>>>> b0b7f2d... Adds grenadine. (#37598)