resolve conflicts and merge

1 files changed, 0 insertions, 40 deletions

diff --git a/swamid-interfederations-1.0/synnefo.sky.deic.dk.xml b/swamid-interfederations-1.0/synnefo.sky.deic.dk.xml
deleted file mode 100644
index 4d09729f..00000000
--- a/swamid-interfederations-1.0/synnefo.sky.deic.dk.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://synnefo.sky.deic.dk/astakos/ui/login/shibboleth/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SLO/SOAP"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Synnefo DeIC</md:ServiceName>
-      <md:ServiceName xml:lang="da">Synnefo DeIC</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to put virtual machines and storage at the disposal of people affiliated with any Danish higher educational institution</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at stille virtuelle maskiner og lagerplads til rådighed for personale og studerende ved de højere læreanstalter</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:Company>DeIC</md:Company>
-    <md:GivenName>Istvan</md:GivenName>
-    <md:SurName>Bernath</md:SurName>
-    <md:EmailAddress>isbe@adm.dtu.dk</md:EmailAddress>
-    <md:TelephoneNumber>+45 40142359</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>