From f11f77702c4bb0f2c2727f7b04a4404b07be4f05 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Wed, 15 Mar 2023 07:17:30 +1000
Subject: [PATCH] Update sif.dm

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

diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm
index 5f69c492e14..4b3cb1980c2 100644
--- a/code/modules/planet/sif.dm
+++ b/code/modules/planet/sif.dm
@@ -280,16 +280,11 @@ var/datum/planet/sif/planet_sif = null
 	effect_message = "<span class='warning'>Rain falls on you.</span>"
 
 	transition_chances = list(
-<<<<<<< HEAD
-		WEATHER_OVERCAST = 25,
-		WEATHER_LIGHT_SNOW = 10,
-=======
 		WEATHER_OVERCAST = 20,
 		WEATHER_LIGHT_SNOW = 5,
 		WEATHER_FOG = 20,
 		WEATHER_RAIN = 40,
 		WEATHER_STORM = 10,
->>>>>>> 9bae8da4d43... Merge pull request #8940 from Mechoid/DistantGulfDLC
 		WEATHER_HAIL = 5
 		)
 	observed_message = "It is raining."