Author: lresende
Date: Fri Oct 2 16:52:23 2009
New Revision: 821097
URL: http://svn.apache.org/viewvc?rev=821097&view=rev
Log:
Fixing merge conflict
Modified:
tuscany/java/sca/modules/pom.xml
Modified: tuscany/java/sca/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=821097&r1=821096&r2=821097&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Fri Oct 2 16:52:23 2009
@@ -60,6 +60,7 @@
<module>databinding-axiom</module>
<module>databinding-jaxb</module>
<module>databinding-jaxb-axiom</module>
+ <module>databinding-json</module>
<module>domain-node</module>
<module>endpoint-tribes</module>
<module>endpoint-wrapper</module>
