From 2cecd9846d2b118d0bc0e866e080beaab480fb32 Mon Sep 17 00:00:00 2001
From: David Welch <welch@cwcom.net>
Date: Sun, 12 Dec 1999 01:04:09 +0000
Subject: [PATCH] Removed typo.

svn path=/trunk/; revision=863
---
 reactos/ntoskrnl/hal/x86/irql.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/reactos/ntoskrnl/hal/x86/irql.c b/reactos/ntoskrnl/hal/x86/irql.c
index 5f4c654abc6..6ee1e46da20 100644
--- 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)