resolve conflicts and merge

1 files changed, 0 insertions, 64 deletions

diff --git a/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5ca67bfa..00000000
--- a/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sant-ssp.sant.ox.ac.uk/shibboleth">
-  <!--
-	This is a "St Antony's College" 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-05-08T17:02:08Z"/>
-  </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://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAMhwD42RejeVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNhbnQtc3NwLnNhbnQub3guYWMudWswHhcNMTMwNTA2MTM0MzQ5WhcNMjMw
-						NTA0MTM0MzQ5WjAhMR8wHQYDVQQDExZzYW50LXNzcC5zYW50Lm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTP5u2MTtwDgk9nE/YOMLyBq
-						kdM0PgaJ7CsZmtf3kynVVet2TCudVGbDPzz0ucLUGvEf5gFtJSmKNtBHS2dpECN3
-						v/tQyeCiaDxVvlpgAMquKStWxPP6/jRS0jk+QtIEzNlMqD9QQ1Y6GZB1hTK9uAXM
-						CtwYZkiwQlDFtygxQO6IMmYidVNmSGGX8WPmwKypijBwpPtLoEA5r2vj6yDZ6d/S
-						0+4w4oaXHIYJ/7i6K/L15gXeN0UG8Cf8eOrU2VKGfdWtJF1TbLlBEiMdfLMDfe5W
-						Q4xRldVXO7rvdHMSkIUw2+qehAzFYRdGOBH5OMZak699Oqcx3qLfRQP7LMgPtwID
-						AQABo0QwQjAhBgNVHREEGjAYghZzYW50LXNzcC5zYW50Lm94LmFjLnVrMB0GA1Ud
-						DgQWBBRmXuxwJcoRmVF9892XQF5+JbXQ/jANBgkqhkiG9w0BAQUFAAOCAQEAbcG6
-						cPqRKjU4ErmifQX4WGhI7VI1cef4Un1kKDSHVj7/ons5ZSUqbHFwnM9m2NRsrRGI
-						WchHAYkVnChDsRPIGrNURK1AqOE2xEo/1C2TeKWZF1wWs+xpPguU5IJO+/esIdwn
-						JtrLlTDk3mlB3bfF2ztvoAHN3UBy+WEfIw/eXdKFEyGQzR2OAAZuKIEOJ3WY3UGR
-						bq0VNxsBVKEJFDN4/AdTPVFyhsDEHYyrQ+z/oiZqsif3QjM7vB8AUXcqUDMNKnpt
-						S/rurkWwA1QuSeIejchaeEijndoSyqUMeTq7IPVoiZ/yUj9fFoh7dNt0uj9E0paJ
-						5gefI6a4f/mL0eFXGQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St Antony's College Shibboleth SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sant.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>St Antony's College IT Support</GivenName>
-    <EmailAddress>mailto:it-support@sant.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Christopher</GivenName>
-    <SurName>Hoskin</SurName>
-    <EmailAddress>mailto:it-manager@sant.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>