resolve conflicts and merge

1 files changed, 0 insertions, 65 deletions

diff --git a/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 55755290..00000000
--- a/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.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://timetable.earth.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a Timetable Service Shibboleth 2 SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://timetable.earth.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOsQvmtCqbDkMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHRpbWV0YWJsZS5lYXJ0aC5veC5hYy51azAeFw0xMTAxMDYxNjU0MThaFw0y
-						MTAxMDMxNjU0MThaMCMxITAfBgNVBAMTGHRpbWV0YWJsZS5lYXJ0aC5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANNEwMterh/GkNFeH1Ox
-						jatg+8pug6Pr2Vyiu2+MLGUvpvhOA+4aHvxCYHTDR2yzWEwHkRILS3yA/B+QiW1y
-						jE4Wg259kMHXskPDdU+62T+tySdj5Hobx05oKGx1PxYy/d2KFzyLe5wfXdmWKrM3
-						dJHgrYIyY5bEOU5CpieAJJ/+Exfchmefht/NfRKV0bkkejvUg+IpdPwm9tSo7z5O
-						My+TYahe3/c5/KroVkcfDuoM1ACCRDsEI2NgBCCtVOYrfJN5F3+aVx58YVoOjC4n
-						4rbjfJDZs0VVJ3Up3B0OGsxAAIoCO8YUfoO50vjvhloqrIYFVLslV2iG0Gm817y3
-						6D0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYdGltZXRhYmxlLmVhcnRoLm94LmFjLnVr
-						MB0GA1UdDgQWBBTG32OU9vtJWEvtMFERCWhc08NbJDANBgkqhkiG9w0BAQUFAAOC
-						AQEAzhSe/ubjNqjFP9MC5k4Fgu24Eqz2WyoiotA8dd2MKepsf0fEHxy6kB/E/lVO
-						aVvdYkRKINYmPbTeN/ylPEBwSVeN71OLBZ19fvMpB6J6lozKUNv+PrwfekSyUeCs
-						5j/pVm+vwWM4onyEUeWkTFmtXaj1tcWGfLSYtX1evbGskPMcReYNFTRKIOzRE0dS
-						KSF/1lKbLyDdcLr2P3aDc8DQYNK9WBiUuMmbN7w9RXp7pv5ZWefRYYVSVM2j6ccF
-						I2JAPf46KCAYCHz0xVbT9I0pJ3kqsy9OCiQfK0zbSCS+3xV4VALStOm8BiY/wDVm
-						/M5ANmyQkgK/JxOjRvUm4lHFeA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timetable.earth.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: Timetable Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Will</GivenName>
-    <SurName>Hanrott</SurName>
-    <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Will</GivenName>
-    <SurName>Hanrott</SurName>
-    <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>