From a9a12cab546082d26eefa93c6f8f9a1ec6e27ac2 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 27 Apr 2021 01:00:20 -0700
Subject: [PATCH] missed that

---
 _maps/RandomZLevels/away_mission/undergroundoutpost45.dmm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm b/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
index 2d7c9d9748..de2105e9d4 100644
--- a/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
@@ -8470,13 +8470,8 @@
 	name = "air out"
 	},
 /turf/open/floor/engine{
-<<<<<<< HEAD
-	name = "air floor";
-	initial_gas_mix = "n2=10580;o2=2644;TEMP=293.15"
-=======
 	initial_gas_mix = "n2=10580;o2=2644";
 	name = "air floor"
->>>>>>> citadel/master
 	},
 /area/awaymission/undergroundoutpost45/engineering)
 "pF" = (