From e5d50e48ed813d4f39e10f0b9cd2da456c82e0d6 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 27 Feb 2021 13:13:26 -0500
Subject: [PATCH] Update frostfly.dm

---
 .../mob/living/simple_mob/subtypes/animal/sif/frostfly.dm     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
index ffba5af281f..2e6eb9940ca 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
@@ -81,11 +81,7 @@
 	return 1	// It literally produces a cryogenic mist inside itself. Cold doesn't bother it.
 
 /mob/living/simple_mob/animal/sif/frostfly/Initialize()
-<<<<<<< HEAD
-	. = ..() //VOREStation Edit
-=======
 	. = ..()
->>>>>>> b22a056... Sideports a couple of init unit tests from Neb. (#7893)
 	smoke_special = new
 	verbs += /mob/living/proc/ventcrawl
 	verbs += /mob/living/proc/hide