From 835e207c5cd1b8b7edd7f6ff96f6cbb0f7f8e143 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 10 Dec 2023 23:39:55 +0100
Subject: [PATCH] fixes unresolved conflict (#7394)

---
 interface/skin.dmf | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/interface/skin.dmf b/interface/skin.dmf
index 16816bdef6..e1c61262d5 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1155,12 +1155,8 @@ window "mainwindow"
 		saved-params = "pos;size;is-minimized;is-maximized"
 		title = "CHOMPStation" // CHOMP Edit
 		is-maximized = true
-<<<<<<< HEAD
-		icon = 'icons/ss13_64.png' // CHOMP Edit
-=======
 		statusbar = false
-		icon = 'icons\\virgoicon.png'
->>>>>>> 625b440806... Merge pull request #15585 from VOREStation/selis-statusbar-fix
+		icon = 'icons/ss13_64.png' // CHOMP Edit
 		macro = "macro"
 		menu = "menu"
 	elem "asset_cache_browser"