resolve conflicts and merge

1 files changed, 0 insertions, 65 deletions

diff --git a/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 2b726150..00000000
--- a/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://naxos.queens.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Naxos Music Site" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-22T15:10:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAL977jDe7lTRMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGhvb3QucXVlZW5zLm94LmFjLnVrMB4XDTExMDkxOTE0MzgwNVoXDTIxMDkx
-						NjE0MzgwNVowHzEdMBsGA1UEAxMUaG9vdC5xdWVlbnMub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUf1Kw2V+k8E3SpgVw20dkkKaTgreb
-						cEaSH9iWBFQwX7kSmLRTgABVGVb80BK44pJ5ob0Fi0N5yC6ZftuAVst2p4CEVege
-						APdglPc5cY49vWQs6P12qaYUe9T/USrpJsWBC2h6Q4yfF4ZpKqZ+S6roCjx0RN+Z
-						Nt/E/v1YhBOWxzDS1XLFkIh7bmkZMXiwEQHIJ8eHvyAHaDPJ+FBEsQBgwFozHD5D
-						OBwCKfu9MC1XkzitnSK7VmKCTKQNMpCjKzHlvv/YAu3+Gpc1+IFZsmFvm3ClMUwO
-						bft0pv0h6LvlOpfsYHdK79DezjOFIC1ErI9GT3jtzq0XAAP7S6AtXwOXAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFGhvb3QucXVlZW5zLm94LmFjLnVrMB0GA1UdDgQWBBSB
-						1rkdpl832bWJL72XQwzSvahSpDANBgkqhkiG9w0BAQUFAAOCAQEAReq3JOhtVKTQ
-						mtSaPD5CCtKYphLumrMiGEc3ANhlnxqbi3sjcGKemaj7vKt1XvpGiIYioMLa5Vhh
-						+48n4V4dwaCPYmwORCo/sQMdyQ5bUEAONX0kqsdY23fOLfdm8EBdNYEVWoVHgWPb
-						meJXz3xzYE+vlimyl5qbv1nVYZo/y8U5cclOUJ2mnrUILpTqaKlm6D94xMVtvJ0d
-						wPg715M2n27ESKdvOZHoH25/GASFleHihcIxhKTq2AFHr+G1OjzuSBS0/SZbkvub
-						pce4A1Yh2scVlAkDZTwf4fSnjM5RVNvhl8LGJvgDzWwJOYXIRYnSmkY93lliTvSz
-						aAJiV4ZfqQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: The Queen's College Naxos Music Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.queens.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Queen's College IT Support</GivenName>
-    <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Queen's College IT Support</GivenName>
-    <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>