From e24941a5ed88bd7eddf1d33050b4cd4b440b06e1 Mon Sep 17 00:00:00 2001
From: Feenie <62373791+FeenieRU@users.noreply.github.com>
Date: Wed, 18 Dec 2024 13:48:28 +0300
Subject: [PATCH] Fix conflict

---
 code/datums/status_effects/neutral.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index f134b31eb20..42391726785 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -610,9 +610,6 @@
 	SIGNAL_HANDLER
 	qdel(src)
 
-<<<<<<< HEAD
-/atom/movable/screen/alert/status_effect/shower_regen
-=======
 /datum/status_effect/washing_regen
 	id = "shower_regen"
 	duration = STATUS_EFFECT_PERMANENT
@@ -655,7 +652,6 @@
 		owner.updatehealth()
 
 /atom/movable/screen/alert/status_effect/washing_regen
->>>>>>> c3c1ae504ae (Allows Felinids to shower (#4686))
 	name = "Washing"
 	desc = "A good wash fills me with energy!"
 	icon_state = "shower_regen"