From a6561628f42615ecf06fd07958a89e3a2824600c Mon Sep 17 00:00:00 2001
From: CovertJaguar <CovertJaguar@gmail.com>
Date: Thu, 8 Aug 2013 17:26:05 -0700
Subject: [PATCH] Fix build.xml

---
 build.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build.xml b/build.xml
index 424fb563..3a75c537 100644
--- a/build.xml
+++ b/build.xml
@@ -18,13 +18,8 @@
 
 	<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
 
-<<<<<<< HEAD
-	<property name="mc.version" value="1.5.2"/>
-	<property name="forge.version" value="7.8.1.738"/>
-=======
 	<property name="mc.version" value="1.6.2"/>
 	<property name="forge.version" value="9.10.0.800"/>
->>>>>>> mc16
 	<!--	<property name="project.version" value="0.0.0"/>-->
 
 	<property name="buildcraft.name" value="buildcraft"/>