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/shibboleth.ensi-bourges.fr-idp-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml index 1b8a4694..1a443825 100644 --- a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml @@ -10,7 +10,7 @@ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensi-bourges.fr</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName> - <mdui:InformationURL xml:lang="fr">http://www.ensi-bourges.fr</mdui:InformationURL> + <mdui:InformationURL xml:lang="fr">http://www.insa-cvl.fr</mdui:InformationURL> <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName> </mdui:UIInfo> </md:Extensions> @@ -49,7 +49,7 @@ xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4 <md:Organization> <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationName> <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">http://www.ensi-bourges.fr</md:OrganizationURL> + <md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL> </md:Organization> <md:ContactPerson contactType="technical"> <md:SurName>Frédéric AURAMBOUT</md:SurName> |