Merge pull request junit-team#334 from matthewfarwell/333-build.xml-i…

…s-broken-after-merges Fixes junit-teamgh-333: build.xml is broken after merge
bbaron · Oct 7, 2011 · ebbcb2d · ebbcb2d
2 parents 4c8d3ff + f82403f
commit ebbcb2d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/build.xml b/build.xml
@@ -7,13 +7,8 @@
   <property name="src" value="src/main/java" />
   <property name="target" location="target" />
   <property name="bin" location="${target}/main" />
-<<<<<<< HEAD
   <property name="version-base" value="4.11" />
   <property name="version-status" value="-SNAPSHOT" />
-=======
-  <property name="version-base" value="4.10" />
-  <property name="version-status" value="" />
->>>>>>> 4.10
   <property name="version" value="${version-base}${version-status}" />
   <property name="dist" value="junit${version}" />
   <property name="versionfile" value="${src}/junit/runner/Version.java" />