Espresso 0.0.1f

2025-07-07 10:43:41 -05:00
parent f677e2e283 8c1d41e881
commit 6baa95a064
2 changed files with 4 additions and 3 deletions
--- a/include/kernel/kconfig.h
+++ b/include/kernel/kconfig.h
@ -14,6 +14,7 @@ extern "C" {
 //#define ENABLE_NETWORK

 typedef struct {
+<<<<<<< HEAD
  bool enable_debug;
  bool enable_fs;
  bool enable_ide;