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.shibboleth.qmul.ac.uk-idp-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml index a52e3875..6a17d509 100644 --- a/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml @@ -147,8 +147,8 @@ <EmailAddress>mailto:m.d.t.evans@qmul.ac.uk</EmailAddress> </ContactPerson> <ContactPerson contactType="technical"> - <GivenName>Kieran</GivenName> - <SurName>Whitbread</SurName> - <EmailAddress>mailto:k.j.whitbread@qmul.ac.uk</EmailAddress> + <GivenName>Tom</GivenName> + <SurName>Jordaan</SurName> + <EmailAddress>mailto:steven.t.s.jordaan@qmul.ac.uk</EmailAddress> </ContactPerson> </EntityDescriptor> |