From e59bb7b26e49dfbc456cf5ae1c2079b693fd95c2 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 5 Jun 2010 04:03:05 +0000
Subject: 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
---
 .../branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo')

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>
-- 
cgit v1.2.3