Removed typo.

[reactos.git] / reactos / ntoskrnl / hal / x86 / irql.c

diff --git a/reactos/ntoskrnl/hal/x86/irql.c b/reactos/ntoskrnl/hal/x86/irql.c
index 5f4c654..6ee1e46 100644 (file)
--- a/reactos/ntoskrnl/hal/x86/irql.c
+++ b/reactos/ntoskrnl/hal/x86/irql.c
@@ -85,7 +85,6 @@ static VOID HiSwitchIrql(KIRQL oldIrql)
        __asm__("sti\n\t");
        return;
      }
-<<<<<<< irql.c
    
    HiSetCurrentPICMask(0);
    if(CurrentIrql == APC_LEVEL)