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/leedstrinity.ac.uk-oala-metadata.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml')
-rw-r--r-- | swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml index 5fe6ff69..5d550df8 100644 --- a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml +++ b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml @@ -91,8 +91,8 @@ <EmailAddress>mailto:R.Dolan@leedstrinity.ac.uk</EmailAddress> </ContactPerson> <ContactPerson contactType="technical"> - <GivenName>Jeremy</GivenName> - <SurName>Grayson</SurName> - <EmailAddress>mailto:J.Grayson@leedstrinity.ac.uk</EmailAddress> + <GivenName>David</GivenName> + <SurName>Baron</SurName> + <EmailAddress>mailto:D.Baron@leedstrinity.ac.uk</EmailAddress> </ContactPerson> </EntityDescriptor> |