resolve conflicts and merge

1 files changed, 0 insertions, 85 deletions

diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml
deleted file mode 100644
index c59e54c5..00000000
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/adfs.smk.dk/FederationMetadata/2007-06/FederationMetadata.xml ">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-19T13:49:56Z" registrationAuthority="https://www.wayf.dk">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <saml:Attribute Name="tags">
-      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
-      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
-    </saml:Attribute>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">smk.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
-        <mdui:DisplayName xml:lang="da">Statens Museum for Kunst</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">National Gallery of Denmark</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFjCCAf4CAQcwDQYJKoZIhvcNAQELBQAwUTFPME0GA1UEAwxGaHR0cHM6Ly9h
-ZGZzLnNtay5kay9GZWRlcmF0aW9uTWV0YWRhdGEvMjAwNy0wNi9GZWRlcmF0aW9u
-TWV0YWRhdGEueG1sIDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMFEx
-TzBNBgNVBAMMRmh0dHBzOi8vYWRmcy5zbWsuZGsvRmVkZXJhdGlvbk1ldGFkYXRh
-LzIwMDctMDYvRmVkZXJhdGlvbk1ldGFkYXRhLnhtbCAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
-CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
-sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
-rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
-pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
-Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAJIFoBPrQfa+h0nbOIcTuGJq1ribQKKtQaCdPYgOFm9YPNNhO5QO
-Z8+W57Jtz9pkVhzcn6LiE4+L5dK+ZC5ERRAGPnMHJOHzC2Ues2bi+uzZbhOHpBAU
-9um7PY3kDH96TGn4zfeG1QMi+erpUOeOlJ58FfWYbrqqlTvRirN6wNW+sJvPm/sz
-s+vN/UXD2qRL55Z6vG06sfvE9O0V4I/9X7001REowDiD6qlU/bZForXE5jw8aOjT
-ta8K6Ot5J2B3eqkFoBhhK/aNJczdTfWgGc6Bru5/0TboE4Rvfy1GmpS7wROlK9bj
-APsEZFBbmAlLIvm0bNHqB/h1FTcRpOQxgMU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFjCCAf4CAQcwDQYJKoZIhvcNAQELBQAwUTFPME0GA1UEAwxGaHR0cHM6Ly9h
-ZGZzLnNtay5kay9GZWRlcmF0aW9uTWV0YWRhdGEvMjAwNy0wNi9GZWRlcmF0aW9u
-TWV0YWRhdGEueG1sIDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMFEx
-TzBNBgNVBAMMRmh0dHBzOi8vYWRmcy5zbWsuZGsvRmVkZXJhdGlvbk1ldGFkYXRh
-LzIwMDctMDYvRmVkZXJhdGlvbk1ldGFkYXRhLnhtbCAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
-CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
-sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
-rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
-pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
-Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAJIFoBPrQfa+h0nbOIcTuGJq1ribQKKtQaCdPYgOFm9YPNNhO5QO
-Z8+W57Jtz9pkVhzcn6LiE4+L5dK+ZC5ERRAGPnMHJOHzC2Ues2bi+uzZbhOHpBAU
-9um7PY3kDH96TGn4zfeG1QMi+erpUOeOlJ58FfWYbrqqlTvRirN6wNW+sJvPm/sz
-s+vN/UXD2qRL55Z6vG06sfvE9O0V4I/9X7001REowDiD6qlU/bZForXE5jw8aOjT
-ta8K6Ot5J2B3eqkFoBhhK/aNJczdTfWgGc6Bru5/0TboE4Rvfy1GmpS7wROlK9bj
-APsEZFBbmAlLIvm0bNHqB/h1FTcRpOQxgMU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/adfs.smk.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Statens Museum for Kunst</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Gallery of Denmark</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Statens Museum for Kunst</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">National Gallery of Denmark</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.smk.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.smk.dk/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Axel</md:GivenName>
-    <md:SurName>Kellermann</md:SurName>
-    <md:EmailAddress>Axel.Kellermann@smk.dk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>