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-dcs.cla.co.uk-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml b/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml index 83bfe7ae..277ebc74 100644 --- a/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml +++ b/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml @@ -87,4 +87,9 @@ <GivenName>Dev Team</GivenName> <EmailAddress>mailto:dev@cloudspringtech.com</EmailAddress> </ContactPerson> + <ContactPerson contactType="technical"> + <GivenName>Phil</GivenName> + <SurName>Amyotte</SurName> + <EmailAddress>mailto:phil@cloudspringtech.com</EmailAddress> + </ContactPerson> </EntityDescriptor> |