Update closed.dm

2017-11-07 03:24:50 -06:00
parent 6a1c0f6683
commit 83c6690721
1 changed files with 0 additions and 4 deletions
@@ -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