resolve conflicts and merge

1 files changed, 0 insertions, 66 deletions

diff --git a/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 73062a5c..00000000
--- a/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://booking.ictf.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ICTF Conference Booking Website" 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="2013-03-22T15:52:20Z"/>
-  </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://booking.ictf.ox.ac.uk/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAK/ba/SUiWe2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWJvb2tpbmcuaWN0Zi5veC5hYy51azAeFw0xMzAzMjEwOTU3NDdaFw0yMzAz
-						MTkwOTU3NDdaMCAxHjAcBgNVBAMTFWJvb2tpbmcuaWN0Zi5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/qxQYodiz2wlFTRKTunx1uXub3
-						aMGFCoCz+m7l9lGQdfA+C24PRxWi4StUGqQmMJa97t/WtYcCbr05Ba4Kwg5v4c7g
-						23YBXFVFrFBtZnohMQSg1IaZNkWK8MwQGJTxFD+2b/KHRkrcHGbjEgHgGM+MYtdb
-						kfWswHFR6HHKDV6zkAL+bK338bj/eCywT4hmhLx2iaI4BkkpQNtLZ3BkTVzC/Wxb
-						xZ+Dy6wAfIkv8RMWbHih0+juYDM4FVTzwcn5Q7+O3Lmf//RyQRdZW3Tm+yJoOT4V
-						0qWkqDidl8WUKwmc/oEbsWcMk0PsmZS8o93f59Rsxrjyn/uCcL6p8t2c72kCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVYm9va2luZy5pY3RmLm94LmFjLnVrMB0GA1UdDgQW
-						BBS5EwhqH1HRiDM3x+20r1OE1uZBDjANBgkqhkiG9w0BAQUFAAOCAQEATmwjfTI3
-						9y/e3p4hR77va41wvVS9TOlLCP8eZb9Kz4VwYW1yivqo2XfuLMgjniQWLJrZDDIL
-						I0Z4D8CbN2Bu2fYK9NE7njsUhfbZUrhBd2Ec2XlL2ef8tI5XP8X+okXMRdcUmAG8
-						7J/DKbjByjYOAgZSR2h2YUrV4UmIb1+40ToFUd8DWVlUdNhtNxRecIZvlSd6HDP6
-						PKn+cVXHEvUHhshA/8+FFbOlbBf+lKNiDKMlCdpEngK16aizDRPSbO7rrDyaz7fB
-						t22YY+B+nypOCwam1z5qvpa4YUyp/zhwyjCVuubNP+IZnM2QCvP1PJaI6bffxSng
-						cP2sORZYpAmpdg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford ICTF Conference Booking Website</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ictf.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jim</GivenName>
-    <SurName>Leek</SurName>
-    <EmailAddress>mailto:jim.leek@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jim</GivenName>
-    <SurName>Leek</SurName>
-    <EmailAddress>mailto:jim.leek@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>