summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-java-2.0-M5
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-06-05 04:03:05 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-06-05 04:03:05 +0000
commite59bb7b26e49dfbc456cf5ae1c2079b693fd95c2 (patch)
tree336100bef2e72db75a15afd2566d3f83632c591e /sca-java-2.x/branches/sca-java-2.0-M5
parent1f825c958b758f0c40f6272660d0360791509919 (diff)
TUSCANY-3565 - Fixing merge conflict on dependency version
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951646 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches/sca-java-2.0-M5')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml
index 708dd46e1b..10b4a18f17 100644
--- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-widget</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M5-SNAPSHOT</version>
</dependency>
<dependency>