From 63480d7af3156d8b6aa226786311390ad139ea7e Mon Sep 17 00:00:00 2001
From: hidnplayr <hidnplayr@kolibrios.org>
Date: Tue, 1 Jun 2010 14:53:43 +0000
Subject: [PATCH] Fixed merging error in RTL8139.Asm for net-branch

git-svn-id: svn://kolibrios.org@1478 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/branches/net/drivers/RTL8139.asm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kernel/branches/net/drivers/RTL8139.asm b/kernel/branches/net/drivers/RTL8139.asm
index 866e5aed72..d481706ac3 100644
--- a/kernel/branches/net/drivers/RTL8139.asm
+++ b/kernel/branches/net/drivers/RTL8139.asm
@@ -283,11 +283,7 @@ align 4
 proc service_proc stdcall, ioctl:dword
 
 	mov	edx, [ioctl]
-<<<<<<< .mine
 	mov	eax, [IOCTL.io_code]
-=======
-	mov	eax, [edx+IOCTL.io_code]
->>>>>>> .r1471
 
 ;------------------------------------------------------