aboutsummaryrefslogtreecommitdiff
path: root/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2015-02-18 13:47:14 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-02-18 13:47:14 +0100
commitbf086cff8ef680b73ca0300147c3c3b70ab32ae0 (patch)
tree1174cdc916982f5f879cde1fc587147a7dced63d /id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries
parent570527d48e3bf03444cdda08a4c1bcf8e7d4ff42 (diff)
parent271e22add71f0260f5d421844a2171a09093f505 (diff)
downloadmoa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.gz
moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.bz2
moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.zip
Merge branch 'datentechnik_modularization' into moa-id-2.2-merge
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java id/server/stork2-commons/pom.xml id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries id/server/stork2-commons/src/main/resources/.svn/entries id/server/stork2-saml-engine/pom.xml pom.xml
Diffstat (limited to 'id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries')
-rw-r--r--id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries62
1 files changed, 0 insertions, 62 deletions
diff --git a/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries b/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries
deleted file mode 100644
index e6b7f5399..000000000
--- a/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-665
-https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/resources
-https://webgate.ec.europa.eu/CITnet/svn/STORK2
-
-
-
-2013-07-25T08:54:09.995385Z
-7
-emsomavmi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-aa842e49-f825-43fc-93ba-11ee9fd5a035
-
-log4j.xml
-file
-
-
-
-
-2013-12-20T12:27:56.542475Z
-4e990a84da0033594135b05cd01a9cdd
-2013-07-25T08:54:09.995385Z
-7
-emsomavmi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-645
-