Update title.dm

2018-01-21 14:20:22 -06:00
parent 8dead1da6a
commit 574bc8fe25
1 changed files with 0 additions and 4 deletions
@@ -34,11 +34,7 @@ SUBSYSTEM_DEF(title)
 		break
 		
 	if(length(title_screens))
-<<<<<<< HEAD
-		file_path = "config/title_screens/images/[pick(title_screens)]"
-=======
 		file_path = "[global.config.directory]/title_screens/images/[pick(title_screens)]"
->>>>>>> 015258d... Config dir again except this time it works (#34606)
 	
 	if(!file_path)
 		file_path = "icons/default_title.dmi"