Conflicts Resolved.

git-svn-id: https://spexeah.com:8443/svn/Asuro@160 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c
2017-05-20 22:55:33 +00:00
parent 87094a7afd
commit 691f2cad0f
8 changed files with 2 additions and 2 deletions
--- a/src/kernel.pas
+++ b/src/kernel.pas
@ -59,7 +59,7 @@ begin
     STI;
     isr32.hook(uint32(@bios_data_area.tick_update));

-     {z:= 1;
+     z:= 1;
     while true do begin
        console.writehex(z);
        console.writestring(': ');
@ -68,7 +68,7 @@ begin
        if pint = nil then while true do begin end else pint^:= 1234;
        //kfree(pint);
        z:=z+1;
-     end;}
+     end;

     //drivers
     keyboard.init(keyboard_layout);