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-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml')
| -rw-r--r-- | swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml index 3763a053..2861ffda 100644 --- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml +++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml @@ -14,7 +14,7 @@ <md:Extensions> <shibmd:Scope regexp="false">drcmr.dk</shibmd:Scope> <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf"> - <mdui:DisplayName xml:lang="da">MR-Forskningssektion (DRCMR)</mdui:DisplayName> + <mdui:DisplayName xml:lang="da">MR-Forskningssektionen (DRCMR)</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Danish Research Centre for Magnetic Resonance</mdui:DisplayName> </mdui:UIInfo> </md:Extensions> @@ -68,9 +68,9 @@ NNHD2yvkSucskE/3RZ6PzZLyXCqpyLE79J6EDbrO1gKPs6Kjqg5W0ljY <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/drcmr.dk:667/simplesaml/saml2/idp/SSOService.php"/> </md:IDPSSODescriptor> <md:Organization> - <md:OrganizationName xml:lang="da">MR-Forskningssektion (DRCMR)</md:OrganizationName> + <md:OrganizationName xml:lang="da">MR-Forskningssektionen (DRCMR)</md:OrganizationName> <md:OrganizationName xml:lang="en">Danish Research Centre for Magnetic Resonance</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="da">MR-Forskningssektion (DRCMR)</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="da">MR-Forskningssektionen (DRCMR)</md:OrganizationDisplayName> <md:OrganizationDisplayName xml:lang="en">Danish Research Centre for Magnetic Resonance</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="da">https://www.hvidovrehospital.dk/afdelinger-og-klinikker/mr-forskningssektion/Sider/mr-forskningssektion.aspx</md:OrganizationURL> <md:OrganizationURL xml:lang="en">http://drcmr.dk/</md:OrganizationURL> |