From ae1ac229d46b87c497f3d215d985d97f960438bf Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 17 Apr 2022 23:37:32 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/power/cells/device_cells.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/modules/power/cells/device_cells.dm b/code/modules/power/cells/device_cells.dm
index 41f5fa8223..84e04687d5 100644
--- a/code/modules/power/cells/device_cells.dm
+++ b/code/modules/power/cells/device_cells.dm
@@ -13,18 +13,11 @@
 	matter = list(MAT_STEEL = 350, MAT_GLASS = 50)
 	preserve_item = 1
 
-<<<<<<< HEAD
 //Yawn Changes
 /obj/item/weapon/cell/device/weapon //Aka adv
 	name = "advanced device power cell" //This was a yawn change. I quite like this, makes more sense.
 	desc = "A small upgraded power cell designed to power handheld devices."
-	icon_state = "m_sup"
-=======
-/obj/item/weapon/cell/device/weapon
-	name = "weapon power cell"
-	desc = "A small power cell designed to power handheld weaponry."
 	icon_state = "weapon_cell"
->>>>>>> 03b55b548a... Merge pull request #12761 from GhostActual/energen_batteries
 	maxcharge = 2400
 	charge_amount = 20
 	origin_tech = list(TECH_POWER = 2)