Author: tkreuzer
Date: Sat Apr 10 02:39:21 2010
New Revision: 46807
URL: http://svn.reactos.org/svn/reactos?rev=46807&view=rev
Log:
fix merge artifact
Modified:
branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild?rev=46807&r1=46806&r2=46807&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild
[iso-8859-1] Sat Apr 10 02:39:21 2010
@@ -93,7 +93,6 @@
<file>systimer.S</file>
</directory>
</if>
-<<<<<<< .working
<if property="ARCH" value="amd64">
<directory name="amd64">
<file>halinit.c</file>
@@ -105,9 +104,6 @@
</directory>
</if>
</directory>
-=======
- </directory>
->>>>>>> .merge-rechts.r46603
<directory name="up">
<file>halinit_up.c</file>
<file>pic.c</file>
