resolve conflicts and merge

1 files changed, 0 insertions, 60 deletions

diff --git a/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d8024467..00000000
--- a/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://online.learning.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Learning Institute" 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-02-15T17:02:24Z"/>
-  </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://online.learning.ox.ac.uk/Shibboleth.sso/Login"/>
-      <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://online.learning.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOXHb2XHLXDRMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGG9ubGluZS5sZWFybmluZy5veC5hYy51azAeFw0xMzAyMTQxMjM5MzJaFw0y
-						MzAyMTIxMjM5MzJaMCMxITAfBgNVBAMTGG9ubGluZS5sZWFybmluZy5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANiPgk2FpHiAr7rihXV6
-						Se87QZa1C0IvcZsWRo14htlX8pOGA0SS35HDw/XYohB+JiCsuRTw3G++/8MDRMrS
-						/PVsTEsPHwrbexlr3tpvwHGk2MGGRlrWDBIUnKsIMx/Fe4tTsBsTP/2TYj7MRS3m
-						bms6w0+ouJDJgF7d07LebLrpMZrYAYIZFT6FSB/KQP8VWytCawI/ZsyXG15aeC9B
-						502unJUCdG8RziUAzoqglLsaGddoEjCctXo9X3WFQS+P7aiKlGjITmPtsuqm1LD1
-						bUBkqhQVHvCFF7Siqurl8MbVFymDZy+YVta06jCtb7bwfDDzj8qlGlSUR/MaiIp1
-						eFECAwEAAaNGMEQwIwYDVR0RBBwwGoIYb25saW5lLmxlYXJuaW5nLm94LmFjLnVr
-						MB0GA1UdDgQWBBRk8+5NSCNEYCchqOa7djqpmDEBizANBgkqhkiG9w0BAQUFAAOC
-						AQEAG4qfEzoBRdcsDiwwUV/0j2+a6jyvvubrSTT0CN7uimYD4WvToZPzbF4Iplhl
-						HfhNea9qW3FZP7HL5WrPJ7BouC4fd1ANNLHkWP4d8SG791AsFmOYE6CuoQNtIgIk
-						gP7FCwLm32qfdKDTstNJD5M8xxnsaPEpJ3CzWdfj9W3+N9zHFN6Mmzx1lmN13caY
-						q1sEo+gMWL70f630KrLkv+mSCX7HOghX0MdfHiMfFF8pWMDcdK95shlMvgxopchA
-						SaTzWzW01k5T4ghk2Vu3wFC5Uhvf784/L5scPVgjdNOphSkNU8CjG6/BKcNB+Sj9
-						o5MI6HedqkvwS3+4RL381q0wMw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.learning.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 Learning Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.learing.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>