From b2d6e23d276f4392797c11c550adf8c5af485eb9 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Wed, 7 Sep 2022 22:14:10 +0200
Subject: [PATCH] fix more merge errors

---
 MareSynchronos/UI/CompactUI.cs | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs
index bbdcbad..04a23e1 100644
--- a/MareSynchronos/UI/CompactUI.cs
+++ b/MareSynchronos/UI/CompactUI.cs
@@ -55,23 +55,6 @@ namespace MareSynchronos.UI
 #endif
             Logger.Verbose("Creating " + nameof(CompactUi));
 
-#if DEBUG
-            string dateTime = "DEV VERSION";
-            try
-            {
-                dateTime = VariousExtensions.GetLinkerTime(Assembly.GetCallingAssembly()).ToString("yyyyMMddHHmmss");
-            }
-            catch (Exception ex)
-            {
-                Logger.Warn("Could not get assembly name");
-                Logger.Warn(ex.Message);
-                Logger.Warn(ex.StackTrace);
-            }
-            this.WindowName = "Mare Synchronos " + dateTime + "###MareSynchronosMainUI";
-#else
-            this.WindowName = "Mare Synchronos " + Assembly.GetExecutingAssembly().GetName().Version + "###MareSynchronosMainUI";
-#endif
-
             _windowSystem = windowSystem;
             _uiShared = uiShared;
             _configuration = configuration;