From 574bc8fe258f9a82eb8f997379c23113505cbad0 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 21 Jan 2018 14:20:22 -0600
Subject: [PATCH] Update title.dm

---
 code/controllers/subsystem/title.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm
index c8dfdbc898..6168ca0905 100644
--- a/code/controllers/subsystem/title.dm
+++ b/code/controllers/subsystem/title.dm
@@ -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"