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/ucl-safety.co.uk-shibboleth-sp.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml')
| -rw-r--r-- | swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml index d213b2b1..0602fa48 100644 --- a/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml +++ b/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml @@ -77,13 +77,13 @@ <OrganizationURL xml:lang="en">http://www.oshens.com/</OrganizationURL> </Organization> <ContactPerson contactType="support"> - <GivenName>Steve</GivenName> - <SurName>Westwood</SurName> - <EmailAddress>mailto:stevew@optimadiagnostics.com</EmailAddress> + <GivenName>Simon</GivenName> + <SurName>Layton</SurName> + <EmailAddress>mailto:Simonl@optimadiagnostics.com</EmailAddress> </ContactPerson> <ContactPerson contactType="technical"> - <GivenName>Steve</GivenName> - <SurName>Westwood</SurName> - <EmailAddress>mailto:stevew@optimadiagnostics.com</EmailAddress> + <GivenName>Simon</GivenName> + <SurName>Layton</SurName> + <EmailAddress>mailto:Simonl@optimadiagnostics.com</EmailAddress> </ContactPerson> </EntityDescriptor> |