From dc9d47572541dcb3d9d6f2d36409be8ab7f13348 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Wed, 31 Jul 2019 01:46:21 -0400
Subject: [PATCH] Update recharger.dm

---
 code/game/machinery/recharger.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 7cfdd25dca1..691492a88fd 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -72,13 +72,8 @@
 			if(EW.use_external_power)
 				to_chat(user, "<span class='notice'>\The [EW] has no recharge port.</span>")
 				return
-<<<<<<< HEAD
 		else if(!G.get_cell() && !istype(G, /obj/item/ammo_casing/nsfw_batt))	//VOREStation Edit: NSFW charging
-			to_chat(user, "This device does not have a battery installed.")
-=======
-		else if(!G.get_cell())
 			to_chat(user, "\The [G] does not have a battery installed.")
->>>>>>> da7ced3... Merge pull request #6328 from Nalarac/recharger
 			return
 
 		user.drop_item()