Update title.dm

2018-01-19 08:48:09 -05:00
parent 7b5b354e9d
commit 844a80dba6
1 changed files with 0 additions and 4 deletions
@@ -35,11 +35,7 @@ SUBSYSTEM_DEF(title)
 		
 	if(length(title_screens))
 		file_path = "config/title_screens/images/[pick(title_screens)]"
-<<<<<<< HEAD
 	
-=======
-
->>>>>>> 1bc398c... Merge pull request #34603 from optimumtact/pigfuck
 	if(!file_path)
 		file_path = "icons/default_title.dmi"