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.rnp.br-idp-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml index d28d070b..bcb7f677 100644 --- a/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml @@ -9,7 +9,7 @@ </md:Extensions> <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> - <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope> + <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false"/> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName> <mdui:DisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName> @@ -54,7 +54,7 @@ ktvi8RxRxbw= </md:IDPSSODescriptor> <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> - <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope> + <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false"/> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> |