Cerulean-Blue/Halyde
3
2
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

Whoops. Forgot to save after solving merge conflict

Browse Source
This commit is contained in:
TheWahlolly
2025-06-26 19:26:59 +03:00
parent f3083478d7
commit c158f5659c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
halyde/core/boot.lua
-4
View File
@@ -1,11 +1,7 @@
local loadfile = ... local loadfile = ...
local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile) local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile)
<<<<<<< HEAD
_G._OSVERSION = "Halyde 1.11.1" _G._OSVERSION = "Halyde 1.11.1"
=======
_G._OSVERSION = "Halyde 1.11.0"
>>>>>>> mikethe223-patch-1
_G._OSLOGO = "" _G._OSLOGO = ""
local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil
repeat repeat