From 8ae369bf774fd5dd9713985831b7c05fe1357e0b Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 16 Oct 2017 07:54:02 -0500
Subject: [PATCH] Update bottle.dm

---
 code/modules/reagents/reagent_containers/bottle.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 2acfdbda60..7da343f31d 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -109,12 +109,7 @@
 
 /obj/item/reagent_containers/glass/bottle/facid
 	name = "Fluorosulfuric Acid Bottle"
-<<<<<<< HEAD
-	desc = "A small bottle. Contains a small amount of Fluorosulfuric Acid"
-	icon_state = "bottle17"
-=======
 	desc = "A small bottle. Contains a small amount of fluorosulfuric acid."
->>>>>>> 0616b84... bottle sprite stuff
 	list_reagents = list("facid" = 30)
 
 /obj/item/reagent_containers/glass/bottle/adminordrazine