aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2011-11-25 12:32:55 (EST)
committerMickael Istria2011-11-25 12:32:55 (EST)
commitb792b17087ee1ca8045c19946421baf0e3a62e53 (patch)
treebd05eadb319d21c05510fb0764685eca0a4f83c6
parentb4fbefc95903e6517081f8f238ac528825110b6f (diff)
downloadorg.eclipse.gmf-tooling-b792b17087ee1ca8045c19946421baf0e3a62e53.zip
org.eclipse.gmf-tooling-b792b17087ee1ca8045c19946421baf0e3a62e53.tar.gz
org.eclipse.gmf-tooling-b792b17087ee1ca8045c19946421baf0e3a62e53.tar.bz2
Specify newer antrun version
-rwxr-xr-xrepository/pom.xml10
1 files changed, 1 insertions, 9 deletions
diff --git a/repository/pom.xml b/repository/pom.xml
index 5397216..928d80a 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -91,19 +91,11 @@
<configuration>
<tasks>
<delete includeemptydirs="false">
-<<<<<<< HEAD
<fileset dir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots/2.4.x-maintenance">
-=======
- <fileset dir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots/3.0">
->>>>>>> refs/heads/antrun
<include name="**" />
</fileset>
</delete>
-<<<<<<< HEAD
<copy includeemptydirs="false" todir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots/2.4.x-maintenance">
-=======
- <copy includeemptydirs="false" todir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots/3.0">
->>>>>>> refs/heads/antrun
<fileset dir="target/checksumFix">
<include name="**" />
</fileset>
@@ -125,4 +117,4 @@
</pluginRepository>
</pluginRepositories>
-</project>
+</project> \ No newline at end of file