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/www.clarin-pl.eu-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml index 2e42ba3c..eff01074 100644 --- a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml +++ b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml @@ -7,8 +7,8 @@ </mdrpi:RegistrationInfo> <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> - <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue> <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue> + <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue> </saml:Attribute> </mdattr:EntityAttributes> </md:Extensions> |