From 93b1ce71fde64b4c39e406df83cf103059471e22 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 8 May 2021 08:14:31 -0400
Subject: [PATCH] Update sif.dm

---
 code/modules/planet/sif.dm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm
index 1519e23eca..cefc549d2a 100644
--- a/code/modules/planet/sif.dm
+++ b/code/modules/planet/sif.dm
@@ -336,16 +336,8 @@ var/datum/planet/sif/planet_sif = null
 		"Loud thunder is heard in the distance.",
 		"A bright flash heralds the approach of a storm."
 	)
-<<<<<<< HEAD
-	outdoor_sounds_type = /datum/looping_sound/weather/rain
-	indoor_sounds_type = /datum/looping_sound/weather/rain/indoors
-||||||| parent of cdbee2a178... Merge pull request #10246 from VOREStation/upstream-merge-8056
-//	outdoor_sounds_type = /datum/looping_sound/weather/rain
-//	indoor_sounds_type = /datum/looping_sound/weather/rain/indoors
-=======
 	outdoor_sounds_type = /datum/looping_sound/weather/rain/heavy
 	indoor_sounds_type = /datum/looping_sound/weather/rain/heavy/indoors
->>>>>>> cdbee2a178... Merge pull request #10246 from VOREStation/upstream-merge-8056
 
 
 	transition_chances = list(