Author: fmoga
Date: Mon Jul 18 15:17:49 2011
New Revision: 1147926
URL: http://svn.apache.org/viewvc?rev=1147926&view=rev
Log:
Fix merge problem
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml?rev=1147926&r1=1147925&r2=1147926&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
(original)
+++
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
Mon Jul 18 15:17:49 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-modules</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,7 +36,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId>
<type>pom</type>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
