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.amue.fr-idp-saml2-metadata.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml')
| -rw-r--r-- | swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml index 8398ebd5..001c29e5 100644 --- a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml +++ b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml @@ -82,8 +82,8 @@ JwghMs3y4HmiEKEylVhTWipavdzRw41b9jbFKmgB7MqdBiCfhQ== <md:OrganizationURL xml:lang="en">http://www.amue.fr</md:OrganizationURL> </md:Organization> <md:ContactPerson contactType="technical"> - <md:SurName>Philippe Bader</md:SurName> - <md:EmailAddress>philippe.bader@amue.fr</md:EmailAddress> + <md:SurName>German hurtado</md:SurName> + <md:EmailAddress>German.hurtado@amue.fr</md:EmailAddress> </md:ContactPerson> <md:ContactPerson contactType="technical"> <md:SurName>Didier Denjean</md:SurName> |