Resolve pom conflict
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 17 Sep 2008 11:07:47 +0000 (11:07 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 17 Sep 2008 11:07:47 +0000 (11:07 +0000)
commit41eba9ddfcad04c6edf08c071ee1f5123a192dc5
tree7e5cbcd83c95ba12b5a12c4fd7938562f9d36ddf
parent87186f2b6b319b9eb0aa6557fd59310a26ef9a9e
Resolve pom conflict

git-svn-id: https://svn.argeo.org/slc/trunk@1595 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
pom.xml