diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-05 04:03:05 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-05 04:03:05 +0000 |
| commit | e59bb7b26e49dfbc456cf5ae1c2079b693fd95c2 (patch) | |
| tree | 336100bef2e72db75a15afd2566d3f83632c591e /sca-java-2.x/trunk/modules | |
| parent | 1f825c958b758f0c40f6272660d0360791509919 (diff) | |
TUSCANY-3565 - Fixing merge conflict on dependency version
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951646 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions