Fix conflict

Fluffy-Frontier · Dec 18, 2024 · e24941a · e24941a
1 parent 32f188b
commit e24941a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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"