From 83c6690721dcc0f82e948b7812f864bfb85f069f Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 7 Nov 2017 03:24:50 -0600
Subject: [PATCH] Update closed.dm

---
 code/game/turfs/closed.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index 9d1d33d115..322a337117 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -36,11 +36,7 @@
 
 /turf/closed/indestructible/splashscreen
 	name = "Space Station 13"
-<<<<<<< HEAD
-	icon = 'config/title_screens/images/title1.dmi'
-=======
 	icon = 'icons/blank_title.png'
->>>>>>> 96390b7... Fixed required images being in the config folder (#32375)
 	icon_state = ""
 	layer = FLY_LAYER