resolve conflict on POM
authorBruno Sinou <bsinou@argeo.org>
Mon, 17 Jan 2011 09:16:59 +0000 (09:16 +0000)
committerBruno Sinou <bsinou@argeo.org>
Mon, 17 Jan 2011 09:16:59 +0000 (09:16 +0000)
commit9f3b8f9394e9802121b194f0f5ba3c6e5b67309c
tree1d6569ab746a18f962168894f6b1517107f37e01
parent32bcfaafbca58d2b808d7d326ab772a85e84999a
resolve conflict on POM

git-svn-id: https://svn.argeo.org/commons/trunk@4040 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml