fix: Allocator Merge Conflicts Resolved
continuous-integration/drone/push Build is passing

This commit is contained in:
t3hn3rd committed 2026-03-04 17:15:56 +00:00
1 parent fc080027b2
commit 61930ac5b5
2 files changed
-2

No files matched your search

-1
View File
@@ -71,7 +71,6 @@ uses
vterminal, vterminal,
graphicsrefresh, usbhotplug; graphicsrefresh, usbhotplug;
procedure terminal_command_meminfo(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
procedure terminal_command_bsod(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf); procedure terminal_command_bsod(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
procedure kmain(mbinfo: Pmultiboot_info_t; mbmagic: uint32); stdcall; procedure kmain(mbinfo: Pmultiboot_info_t; mbmagic: uint32); stdcall;
-1
View File
@@ -43,7 +43,6 @@ begin
tracer.push_trace('progmanager.init'); tracer.push_trace('progmanager.init');
{ Register commands from provider units } { Register commands from provider units }
stdio.registerCommand('MEMINFO', @kernel.terminal_command_meminfo, 'Print Simple Memory Information.');
stdio.registerCommand('BSOD', @kernel.terminal_command_bsod, 'Force a Panic Screen.'); stdio.registerCommand('BSOD', @kernel.terminal_command_bsod, 'Force a Panic Screen.');
stdio.registerCommand('CPU', @cpu.Terminal_Command_CPU, 'CPU Info.'); stdio.registerCommand('CPU', @cpu.Terminal_Command_CPU, 'CPU Info.');
stdio.registerCommand('DEV', @drivermanagement.terminal_command_dev, 'Driver Management Interface.'); stdio.registerCommand('DEV', @drivermanagement.terminal_command_dev, 'Driver Management Interface.');