diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-04-10 14:47:17 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-04-10 14:47:17 +0200 |
| commit | abed962bdcdc97178d4bc658bdaa8a5892aa4e63 (patch) | |
| tree | b5deebe3209148889ef496f1a31d69500e6855fb /swamid-testing-sp-1.0.mxml | |
| parent | cbc1bbbaed145de2dfd6b09387f55fa14786ccdc (diff) | |
| parent | 3ec6224cc6cf1ad320a51edd64b415be4641aa09 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-sp-2.0.mxml
Diffstat (limited to 'swamid-testing-sp-1.0.mxml')
| -rw-r--r-- | swamid-testing-sp-1.0.mxml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml index e10b9944..8d76d277 100644 --- a/swamid-testing-sp-1.0.mxml +++ b/swamid-testing-sp-1.0.mxml @@ -266,7 +266,6 @@ <xi:include href="swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml"/> <xi:include href="swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml"/> <xi:include href="swamid-1.0/test-chalmers.pingpong.net.xml"/> - <xi:include href="swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml"/> <xi:include href="swamid-1.0/minastudier.ladok.umu.se.xml"/> <xi:include href="swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml"/> <xi:include href="swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml"/> |