diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-02 16:52:23 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-02 16:52:23 +0000 |
| commit | 00cea66970ef4e9c4ae1fd5b928e9b57db33dd3f (patch) | |
| tree | 0abc158b2ca126adcee0b5b99dd04a98c3b952be | |
| parent | 8316669d4cc10f622c17d7992eb44d7e4d59b9c4 (diff) | |
Fixing merge conflict
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@821097 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/sca/modules/pom.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml index 837b836752..44a0d0a0ea 100644 --- a/java/sca/modules/pom.xml +++ b/java/sca/modules/pom.xml @@ -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> |