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.mba.ac.uk-idp-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml index f852a8a9..9fff0d8c 100644 --- a/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mba.ac.uk/idp/shibboleth"> <!-- - This is a Shibboleth IdP for The Marine Biological Association of the United Kingdom. + This is a Shibboleth IdP for The Marine Biological Association of the United Kingdom. --> <Extensions> <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-16T15:47:41Z"> |