diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-11-13 10:21:57 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-11-13 10:21:57 +0100 |
| commit | ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1 (patch) | |
| tree | f01ad482013d2b45e275be3fc39b59ba02a8de72 /id/ConfigWebTool/pom.xml | |
| parent | 5a75a47186f080508052b8c197aaec8eba013362 (diff) | |
| parent | f6c9d4d2f12db71cf1195f0f0f932cf808289bb4 (diff) | |
| download | moa-id-spss-ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1.tar.gz moa-id-spss-ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1.tar.bz2 moa-id-spss-ad6cd1e156a7fcdadedf7fe7b54dedf8c0c897b1.zip | |
Merge branch 'moa2_0_tlenz' into moa_2.0_OAuth
Conflicts:
id/ConfigWebTool/pom.xml
Diffstat (limited to 'id/ConfigWebTool/pom.xml')
| -rw-r--r-- | id/ConfigWebTool/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 7450c4949..dd56a6151 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -16,7 +16,6 @@ <properties> <repositoryPath>${basedir}/../../repository</repositoryPath> </properties> - <dependencies> <dependency> @@ -76,6 +75,7 @@ <artifactId>commons-iaik</artifactId> <version>0.7.1</version> </dependency> + </dependencies> </project>
\ No newline at end of file |