cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

whoops

Browse Source
This commit is contained in:
Jordie0608
2015-01-23 14:19:01 +11:00
parent 26161659c5
commit 468557c5b7
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/reagents/reagent_containers/bottle.dm
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD:code/modules/reagents/reagent_containers/bottle.dm
//Not to be confused with /obj/item/weapon/reagent_containers/food/drinks/bottle //Not to be confused with /obj/item/weapon/reagent_containers/food/drinks/bottle
/obj/item/weapon/reagent_containers/glass/bottle /obj/item/weapon/reagent_containers/glass/bottle