missed that

2021-04-27 01:00:20 -07:00
parent 47489c21d6
commit a9a12cab54
1 changed files with 0 additions and 5 deletions
@@ -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" = (