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 /swamid-interfederations-2.0/idp.cit.ie-idp.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.cit.ie-idp.xml')
-rw-r--r-- | swamid-interfederations-2.0/idp.cit.ie-idp.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swamid-interfederations-2.0/idp.cit.ie-idp.xml b/swamid-interfederations-2.0/idp.cit.ie-idp.xml index 1d5cf2c6..dc2757c4 100644 --- a/swamid-interfederations-2.0/idp.cit.ie-idp.xml +++ b/swamid-interfederations-2.0/idp.cit.ie-idp.xml @@ -3,7 +3,7 @@ <md:Extensions> <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-01-20T00:00:00Z"/> </md:Extensions> - <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol"> + <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0"> <md:Extensions> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cit.ie</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> |