Merge remote repository

Initial commit
2026-10-30 14:50:10 +01:00 · 2026-10-30 14:48:19 +01:00
1 changed files with 5 additions and 1 deletions
@@ -1,3 +1,7 @@
 # HOESx1

+<<<<<<< HEAD
 HOESx1 is an operating system running on hexcasting inside minecraft
+=======
+HOESx1 is an operating system running on hexcasting inside minecraft
+>>>>>>> 8c8d3dbb1559a05ef8bfc5f5087dc2180b4f9389
Author	SHA1	Message	Date
stefan	cb8ffeae19	Merge remote repository	2026-10-30 14:50:10 +01:00
stefan	325600b7e0	Initial commit	2026-10-30 14:48:19 +01:00