Author: lresende
Date: Sat Jun 5 04:03:05 2010
New Revision: 951646
URL: http://svn.apache.org/viewvc?rev=951646&view=rev
Log:
TUSCANY-3565 - Fixing merge conflict on dependency version
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml?rev=951646&r1=951645&r2=951646&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml
(original)
+++
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/web-javascript-dojo/pom.xml
Sat Jun 5 04:03:05 2010
@@ -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>
