cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Why is this even a conflict.

Browse Source
This commit is contained in:
Unknown
2019-03-27 14:24:57 -04:00
parent 916e32e9eb
commit b3ee0e766f
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_eyes.dm
-4
View File
@@ -124,9 +124,6 @@
/datum/gear/eyes/circuitry
display_name = "goggles, circuitry (empty)"
<<<<<<< HEAD
path = /obj/item/clothing/glasses/circuitry
=======
path = /obj/item/clothing/glasses/circuitry
/datum/gear/eyes/glasses/rimless
@@ -144,4 +141,3 @@
/datum/gear/eyes/glasses/prescriptionthin
display_name = "Glasses, prescription thin frame"
path = /obj/item/clothing/glasses/regular/thin
>>>>>>> e0d442b... Merge pull request #5838 from Cerebulon/glassesfix