From e46811d210da2b4b30e0bfd7328f31e8e1bd1d02 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 13 Dec 2017 12:03:21 -0500
Subject: [PATCH] Update cell.dm

---
 code/modules/power/cell.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 1755084549..1e1407e852 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -23,11 +23,7 @@
 /obj/item/stock_parts/cell/get_cell()
 	return src
 
-<<<<<<< HEAD
-/obj/item/stock_parts/cell/New()
-=======
 /obj/item/stock_parts/cell/Initialize(mapload, override_maxcharge)
->>>>>>> ccfe2d4... Merge pull request #33481 from AutomaticFrenzy/patch/celldesc
 	. = ..()
 	START_PROCESSING(SSobj, src)
 	if (override_maxcharge)