Initial commit

2026-04-09 13:24:44 +03:00
parent 6328aea2f5
commit 522946453b
2 changed files with 7 additions and 0 deletions
--- a/inc/mem_seg.h
+++ b/inc/mem_seg.h
@@ -1,9 +1,12 @@
 #ifndef __MEM_SEG_H__
 #define __MEM_SEG_H__

+<<<<<<< HEAD
 #ifndef DEVICE_TYPE
 #define DEVICE_TYPE EXTENDED_DEVICE_TYPE_DUMMY
 #endif
+=======
+>>>>>>> 1f4cc4d (Initial commit)

 // #define MEMSEG_PC_SEG_NUM 0
 // #define MEMSEG_PC_ADDR 0