cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes unresolved conflict (#7394)

Browse Source
This commit is contained in:
Kashargul
2023-12-10 23:39:55 +01:00
committed by GitHub
parent 9a065ff40a
commit 835e207c5c
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/skin.dmf
View File

@@ -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"