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/test-secure.palgraveconnect.com-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml index c9e176f8..94bd21c9 100644 --- a/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml +++ b/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml @@ -44,9 +44,9 @@ <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="support"> <GivenName>John</GivenName> @@ -54,9 +54,9 @@ <EmailAddress>mailto:j.ollier@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> <ContactPerson contactType="technical"> <GivenName>John</GivenName> |