resolve conflicts and merge

1 files changed, 0 insertions, 65 deletions

diff --git a/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8f53f3ad..00000000
--- a/swamid-interfederations-2.0/ballhmauth.balliol.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://ballhmauth.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a Balliol College: HM and JWT Network Registrations Shibboleth SP for Oxford University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-16T15:58:25Z"/>
-  </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://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAOGLhfhvZmWrMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2JhbGxobWF1dGguYmFsbGlvbC5veC5hYy51azAeFw0xMjA3MTIwOTIzMTVa
-						Fw0yMjA3MTAwOTIzMTVaMCYxJDAiBgNVBAMTG2JhbGxobWF1dGguYmFsbGlvbC5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVc+Rvpuetz
-						KGBDcLb5IE7kVWS9ocVnky49w1dPWfAzoCD6M8uUZXo5p3Uhz9qkjewinGfJzGGR
-						DuOFQY7vHqdkStjTD6KiJpGqc7KMEVS3ALqVKcDooWXxoXPFVLw/KSerK+vJ2f0S
-						dmQSzHZbybHrQiu/uSiEgiAS9LFNpTf1NqYzJKpgQHOk43Fy1qxcFmY9etlzyQNF
-						CIrmrrGKqPGhE4I5wdXa+iSuodHBok7f66EcgX425Icyy9jpAG+I4vK/ZW2QaFd+
-						ls2WoeyHqeHd+6bDzx9PM0IZg/yoBB+yNazI0UXXvmphPSpPUCxza+BBY4M2JOOc
-						9ckQg6JE+tcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYmFsbGhtYXV0aC5iYWxsaW9s
-						Lm94LmFjLnVrMB0GA1UdDgQWBBRdqcX7hnNNa8HySZBpyM0WVZQPAzANBgkqhkiG
-						9w0BAQUFAAOCAQEAGs2pK0uRW742oR1oqbMsSclc+iFboWXUQgWGFv8MiuZllbwa
-						THJNCCpmBw2OYjfXaztvbJ8csEGsbYmaNO/hLqeIrEdhS4WyBqK4LpNKFiasX+a1
-						ChokEfss17afSc22gsbV+DL3NgCIpI+LwTjGHSHciZ6mfinYoMyyRDYGUJ+Ty75e
-						dU3NwYxplRumD3fneIrLsQ4NqV979yvJSWlShKdb0O+4t1qRSMVPZb74plelI/f0
-						c28WqAH/V6JwRtXQEm30eRjZhRD4SXJtDLyPkLuKXQ/FTXRdI1HSqVMMi2ll4VqN
-						+VBl8jTl7qVzQIzFCFIdwLOaSSCvNrDsB7b9Cg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Balliol College - HM and JWT Network Registrations</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>