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/shibboleth.nptc.ac.uk-idp-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml index 8d4fbcf8..57a06dbc 100644 --- a/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml @@ -4,11 +4,6 @@ This is a Shibboleth IdP for Neath Port Talbot College. --> <Extensions> - <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> - <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> - <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue> - </saml:Attribute> - </mdattr:EntityAttributes> <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-01T09:00:48Z"> <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> |