aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy/conf/moa-id-oa/oa.properties
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-02-03 15:38:24 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-02-03 15:38:24 +0100
commitef35deb727190363d17d693d10f27171787cc92c (patch)
tree92f4a4c6133147716328f93b86239d5dd8fcc629 /id/server/data/deploy/conf/moa-id-oa/oa.properties
parent4333fd60c637f2a739e3db17d00f61c68c465a8e (diff)
downloadmoa-id-spss-ef35deb727190363d17d693d10f27171787cc92c.tar.gz
moa-id-spss-ef35deb727190363d17d693d10f27171787cc92c.tar.bz2
moa-id-spss-ef35deb727190363d17d693d10f27171787cc92c.zip
Solve some merge problems
Diffstat (limited to 'id/server/data/deploy/conf/moa-id-oa/oa.properties')
0 files changed, 0 insertions, 0 deletions