Update headset.dm

2018-05-02 10:34:45 -04:00
parent c7ea689679
commit 3f50934c92
1 changed files with 0 additions and 5 deletions
@@ -7,13 +7,8 @@
 	subspace_transmission = TRUE
 	canhear_range = 0 // can't hear headsets from very far away

-<<<<<<< HEAD
-	slot_flags = SLOT_EARS
-	var/obj/item/device/encryptionkey/keyslot2 = null
-=======
 	slot_flags = ITEM_SLOT_EARS
 	var/obj/item/encryptionkey/keyslot2 = null
->>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
 	dog_fashion = null

 /obj/item/device/radio/headset/suicide_act(mob/living/carbon/user)