Update bottle.dm

2017-10-16 07:54:02 -05:00
parent 11eff73897
commit 8ae369bf77
1 changed files with 0 additions and 5 deletions
@@ -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