diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
| commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
| tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /sp-with-simplesign | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'sp-with-simplesign')
| -rw-r--r-- | sp-with-simplesign | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sp-with-simplesign b/sp-with-simplesign index 28a54595..4b99548e 100644 --- a/sp-with-simplesign +++ b/sp-with-simplesign @@ -27,7 +27,6 @@ cambro-test-26.umdc.umu.se-shibboleth.xml cambro-tst1.umdc.umu.se-shibboleth.xml cambro-utv1.umdc.umu.se-shibboleth.xml captivelan-test.it.su.se-shibboleth.sso.xml -captivelan.it.su.se-shibboleth.sso.xml cas.weblogin.uu.se-cas.xml cdn.nordunet.tv-shibboleth.xml ci.nordu.net-shibboleth.xml @@ -224,7 +223,6 @@ sp.it.gu.se-shibboleth.xml sp.kau.se-shibboleth.xml sp.swamid.se-shibboleth.xml sp.tools.sunet.se-shibboleth.xml -sp.wavelan.su.se-shibboleth.sso.xml su.avedas.com-shibboleth.xml sutest.dsv.su.se-shibboleth.xml swamid.shh.se-idp-shibboleth.xml |