From 0846f66a7eebf245367190dd25e7ee88523cc011 Mon Sep 17 00:00:00 2001
From: ZeroByteOrg <thatguy@zerobyte.org>
Date: Fri, 27 May 2022 13:00:23 -0500
Subject: [PATCH] Removed merge conflict tag from gui.cpp

---
 src/gui/gui.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index dd622d2a0..0de71fe3c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -2732,13 +2732,10 @@ bool FurnaceGUI::loop() {
       midiLock.unlock();
     }
 
-<<<<<<< HEAD
     eventTimeEnd=SDL_GetPerformanceCounter();
 
     layoutTimeBegin=SDL_GetPerformanceCounter();
-    
-=======
->>>>>>> Commander X16 file export: ZSM format
+
     ImGui_ImplSDLRenderer_NewFrame();
     ImGui_ImplSDL2_NewFrame(sdlWin);
     ImGui::NewFrame();