Merge branch 'mikethe223-patch-1'
This commit was merged in pull request #27.
This commit is contained in:
@@ -1,7 +1,11 @@
|
||||
local loadfile = ...
|
||||
local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile)
|
||||
|
||||
<<<<<<< HEAD
|
||||
_G._OSVERSION = "Halyde 1.11.1"
|
||||
=======
|
||||
_G._OSVERSION = "Halyde 1.11.0"
|
||||
>>>>>>> mikethe223-patch-1
|
||||
_G._OSLOGO = ""
|
||||
local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil
|
||||
repeat
|
||||
|
||||
Reference in New Issue
Block a user