Releng: fix merge errors
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index a9492de..408d4c1 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -22,17 +22,12 @@
# ------------- insert current versions here ---------------
# Details of the Eclipse SDK built upon:
-run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.8.100.v20130514-1028/scripts
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.9.0.v20131003-1506/scripts
org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.3.0.v20130327-1440.jar
# for patching our patch feature to match this version with any suffix:
-<<<<<<< HEAD
jdt.feature.version=3.9.0.v20130605-2000
jdt.feature.version.next=3.9.0.v20130605-2001
-=======
-jdt.feature.version=3.10.0.v20131212-16003.10.0.v20131212-1600
-jdt.feature.version.next=3.10.0.v20131212-1600
->>>>>>> refs/heads/master
# -----------------------------------------------------------
#Git Support for PDE BUILD: