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/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml')
| -rw-r--r-- | swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml index c00636e0..7467591c 100644 --- a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml +++ b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml @@ -84,6 +84,7 @@ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrstud.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrzz.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsin.hr</shibmd:Scope> + <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hvu-morh.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hzjz.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iarh.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idb.hr</shibmd:Scope> @@ -186,7 +187,6 @@ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkatarina.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkri.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkst.hr</shibmd:Scope> - <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcs.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tera.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tfmvi.hr</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thalassotherapia-opatija.hr</shibmd:Scope> |