From 3e5bd63029c721f1d420d6f67e4ad165aa2a3000 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Wed, 11 Sep 2019 15:47:51 +0200
Subject: [PATCH] Missed a merge conflict

---
 zscript/utmenu.zsc | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/zscript/utmenu.zsc b/zscript/utmenu.zsc
index 24bb4d4..1eeebbe 100644
--- a/zscript/utmenu.zsc
+++ b/zscript/utmenu.zsc
@@ -26,10 +26,7 @@ Class OptionMenuItemUTHudPreview : OptionMenuItem
 	{
 		int xpos = indent + CursorSpace();
 		int ypos = y+OptionMenuSettings.mLinespacing*CleanYfac_1;
-<<<<<<< HEAD
 		Screen.DrawFrame(xpos,ypos,64*CleanXFac_1,64*CleanYFac_1);
-=======
->>>>>>> experimental
 		Screen.DrawTexture(tex[0],false,xpos,ypos,DTA_CleanNoMove_1,true);
 		Color tintcolor = Color("White");
 		switch ( mColorP.GetInt() )
@@ -52,7 +49,6 @@ Class OptionMenuItemUTHudPreview : OptionMenuItem
 		Screen.DrawTexture(tex[1],false,xpos,ypos,DTA_CleanNoMove_1,true,DTA_FillColor,tintcolor,DTA_Alpha,alpha,DTA_LegacyRenderStyle,STYLE_AddShaded);
 		return -1;
 	}
-<<<<<<< HEAD
 }
 
 // changes to Tahoma
@@ -88,6 +84,3 @@ Class UTMessageBox : MessageBoxMenu
 		mMessage = textFont.BreakLines(Stringtable.Localize(message),generic_ui?600:300);
 	}
 }
-=======
-}
->>>>>>> experimental