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/secure.palgraveconnect.com-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml index 6b58d1de..c3d1e542 100644 --- a/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml +++ b/swamid-interfederations-2.0/secure.palgraveconnect.com-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://secure.palgraveconnect.com/shibboleth"> <!-- - This is a Palgrave Connect OpenAthens SP for Macmillan Publishers Limited. + This is a "Palgrave Connect" OpenAthens SP for Macmillan Publishers Limited. --> <Extensions> <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-03T09:56:41Z"/> @@ -44,13 +44,13 @@ <OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</OrganizationURL> </Organization> <ContactPerson contactType="support"> - <GivenName>Mohammad</GivenName> - <SurName>Nawab</SurName> - <EmailAddress>mailto:m.nawab@nature.com</EmailAddress> + <GivenName>Chike</GivenName> + <SurName>Abia</SurName> + <EmailAddress>mailto:C.Abia@nature.com</EmailAddress> </ContactPerson> <ContactPerson contactType="technical"> - <GivenName>Mohammad</GivenName> - <SurName>Nawab</SurName> - <EmailAddress>mailto:m.nawab@nature.com</EmailAddress> + <GivenName>Chike</GivenName> + <SurName>Abia</SurName> + <EmailAddress>mailto:C.Abia@nature.com</EmailAddress> </ContactPerson> </EntityDescriptor> |