From c158f5659cf29add99dd54d67b9e4c8ea17ebfaa Mon Sep 17 00:00:00 2001
From: TheWahlolly <justexobyte@gmail.com>
Date: Thu, 26 Jun 2025 19:26:59 +0300
Subject: [PATCH] Whoops. Forgot to save after solving merge conflict

---
 halyde/core/boot.lua | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/halyde/core/boot.lua b/halyde/core/boot.lua
index 0f585b2..f3e5714 100644
--- a/halyde/core/boot.lua
+++ b/halyde/core/boot.lua
@@ -1,11 +1,7 @@
 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