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.aai.arnes.si-idp-20090116.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml')
| -rw-r--r-- | swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml index e627566b..b81f68ff 100644 --- a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml +++ b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml @@ -300,6 +300,9 @@ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ludvik.si</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sveta-ana.si</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kozara.si</shibmd:Scope> + <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dd-msobota.si</shibmd:Scope> + <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskomenda-moste.si</shibmd:Scope> + <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">padeznik-mojasola.si</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName> <mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName> |