From 844a80dba6e5f0766e74313df9851e4cd29b4fef Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 19 Jan 2018 08:48:09 -0500
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 b8c6d9a2a0..4cdde58d33 100644
--- a/code/controllers/subsystem/title.dm
+++ b/code/controllers/subsystem/title.dm
@@ -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"