archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge problem

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1147926 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
fmoga 2011-07-18 15:17:49 +00:00
parent f7dceb9384
commit dd3bbfc71e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sca-java-2.x/branches/2.0-Beta3/modules/binding-comet-runtime/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.tuscany.sca</groupId> <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-modules</artifactId> <artifactId>tuscany-modules</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-Beta3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -36,7 +36,7 @@
<groupId>org.apache.tuscany.sca</groupId> <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId> <artifactId>tuscany-base-runtime-pom</artifactId>
<type>pom</type> <type>pom</type>
<version>2.0-SNAPSHOT</version> <version>2.0-Beta3-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>