Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.79.2.3 -r1.79.2.4
--- lams_build/build.xml	30 Jun 2009 02:30:52 -0000	1.79.2.3
+++ lams_build/build.xml	30 Jun 2009 02:53:02 -0000	1.79.2.4
@@ -322,7 +322,6 @@
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 			<property name="generate.for.installers" value="${generate.for.installers}"/>
 		</ant>
-<<<<<<< build.xml
 		<ant antfile="../${tool_videorecorder_dir}/build.xml" target="deploy-tool"
 						inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
@@ -343,9 +342,6 @@
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 			<property name="generate.for.installers" value="${generate.for.installers}"/>
 		</ant>
-=======
-		
->>>>>>> 1.79.2.1.2.5
 	</target>
 
 	<target name="deploy-minimal-tools" description="Deploy the tools shared between LAMS and RAMS. Called by deploy-lams-tools and deploy-rams-tools">