TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-01-06 11:12:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Installer.lua

Browse Source
This commit is contained in:
Igor Timofeev 2017-09-09 22:06:34 +03:00 committed by GitHub
parent d3c7f00d93
commit 0d68fccc73
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Installer/Installer.lua
View File

@ -34,11 +34,7 @@ if computer.totalMemory() < 2097152 then
table.insert(reasons, "Not enough RAM: MineOS requires at least 2MB (2x Tier 3.5 RAM modules) to work properly.")
end
<<<<<<< HEAD
if #reasons > 0 and not options.skiphardwarecheck and not options.s then
=======
if #reasons > 0 and not options.skiphardwarecheck then
>>>>>>> origin/master
print(" ")
for i = 1, #reasons do
print(reasons[i])