[Wine-patches] [try 2] ntoskrnl.exe: Fixed merge error.

[Alexander Morozov]

Сорри, вместо предыдущего патча надо использовать этот.
----------- следующая часть -----------
From 4900246a262ba6616b3dae341ab1132fec2a34f2 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Thu, 15 Jan 2009 18:05:51 +0300
Subject: [PATCH] ntoskrnl.exe: Fixed merge error.

---
 dlls/ntoskrnl.exe/ntoskrnl.c |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 02ea02a..55b819c 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -1320,7 +1320,6 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag )
 
 
 /***********************************************************************
-<<<<<<< HEAD:dlls/ntoskrnl.exe/ntoskrnl.c
  *           KeGetCurrentThread   (NTOSKRNL.EXE.@)
  */
 PKTHREAD WINAPI KeGetCurrentThread(void)
@@ -1420,13 +1419,6 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX Mutex, BOOLEAN Wait )
 {
     TRACE("%p %d\n", Mutex, Wait);
     return STATUS_SUCCESS;
-=======
- *           KeInitializeEvent   (NTOSKRNL.EXE.@)
- */
-void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State )
-{
-    FIXME( "stub: %p %d %d\n", Event, Type, State );
->>>>>>> 254f60b985de89a2bd4f5a5aa94aa569684d6732:dlls/ntoskrnl.exe/ntoskrnl.c
 }
 
 
@@ -1435,8 +1427,7 @@ void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State )
  */
 void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock )
 {
-<<<<<<< HEAD:dlls/ntoskrnl.exe/ntoskrnl.c
-    TRACE("%p\n", SpinLock);
+    TRACE( "stub: %p\n", SpinLock );
 }
 
 
@@ -1448,9 +1439,6 @@ UINT WINAPI PoSetPowerState( PDEVICE_OBJECT DeviceObject,
 {
     TRACE("%p %u %u\n", DeviceObject, Type, State.DeviceState);
     return State.DeviceState;
-=======
-    FIXME( "stub: %p\n", SpinLock );
->>>>>>> 254f60b985de89a2bd4f5a5aa94aa569684d6732:dlls/ntoskrnl.exe/ntoskrnl.c
 }
 
 
-- 
1.6.0.2.GIT