resolve conflicts and merge

1 files changed, 0 insertions, 93 deletions

diff --git a/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml b/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml
deleted file mode 100644
index 4b6f4648..00000000
--- a/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.canstudios.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Boardworks Limited.
-	-->
-  <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRTCCAi2gAwIBAgIJALlo8Ome5hOyMA0GCSqGSIb3DQEBBQUAMDUxMzAxBgNV
-						BAMTKmlwLTEwLTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDAe
-						Fw0xMTA0MDQxMDIyMTdaFw0yMTA0MDExMDIyMTdaMDUxMzAxBgNVBAMTKmlwLTEw
-						LTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMyqeka+BvUmQyfbNfa3cIm0qDc0hrdsNcWe
-						WwqLVgVn1ybRvG7meK+hb9SunW9jo6drWN5YcDuKAvSzNFO5PaPM2c2rcSjqGnuk
-						hGt490fIchEKlEqMCdlcQ3iuADLDiugbWDmcUw9KsC7oXMCSeILvOGdX1uIe9TBY
-						zKcc8hUAHQ3wtcLspb36bkDK4NUzIaGgVLcq9g6zILb+Fcn/LhkLdJtoawiFM/Fq
-						I9GL0IpsUEcwBnVVJ0/95YUh2pc6XRp6+AYQNFm5z2KSJbJkXRkU2yuORh1Hj3dq
-						TZ+F+p0RDydWwqiRZcNUkfyb+CaJg3hFivY+C/AHu8djt56ahYECAwEAAaNYMFYw
-						NQYDVR0RBC4wLIIqaXAtMTAtNTYtNjctMTQzLmV1LXdlc3QtMS5jb21wdXRlLmlu
-						dGVybmFsMB0GA1UdDgQWBBT2pR0g9K3m7Y6bIq/RsoOj6lHjUTANBgkqhkiG9w0B
-						AQUFAAOCAQEANTAPP0B5Uh4eRpl2qmgeS4m+c0wNvYOeApgytH9UiCouivZrfx1x
-						0/0PUaF0rSnVjcGaGNVBkWh6Lj6ghfVis2BUa4McyetgsV1KmSsrrN+AtlK3WXkf
-						WLd6WQ/fB3FQ7gPEczRULjS6/tOrr3o96KW2ANkEZE3xjZi0YDC89dlEsESdojr4
-						icU0w5Hh2enXVym/rIrPReK+G19phnsZFw1AhSXQmhq0L1x4f0XQMHj0C2QDlJOD
-						SyG+rbw/0u9SeNx/iMZKa1qKz9WEOj6CZGh83bW8OneXzP04/g98kWgQ7FIAzYYb
-						zEv3N6DD8ZWFPrnpVVTE8F0rXeUFmbax4g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRTCCAi2gAwIBAgIJALlo8Ome5hOyMA0GCSqGSIb3DQEBBQUAMDUxMzAxBgNV
-						BAMTKmlwLTEwLTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDAe
-						Fw0xMTA0MDQxMDIyMTdaFw0yMTA0MDExMDIyMTdaMDUxMzAxBgNVBAMTKmlwLTEw
-						LTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMyqeka+BvUmQyfbNfa3cIm0qDc0hrdsNcWe
-						WwqLVgVn1ybRvG7meK+hb9SunW9jo6drWN5YcDuKAvSzNFO5PaPM2c2rcSjqGnuk
-						hGt490fIchEKlEqMCdlcQ3iuADLDiugbWDmcUw9KsC7oXMCSeILvOGdX1uIe9TBY
-						zKcc8hUAHQ3wtcLspb36bkDK4NUzIaGgVLcq9g6zILb+Fcn/LhkLdJtoawiFM/Fq
-						I9GL0IpsUEcwBnVVJ0/95YUh2pc6XRp6+AYQNFm5z2KSJbJkXRkU2yuORh1Hj3dq
-						TZ+F+p0RDydWwqiRZcNUkfyb+CaJg3hFivY+C/AHu8djt56ahYECAwEAAaNYMFYw
-						NQYDVR0RBC4wLIIqaXAtMTAtNTYtNjctMTQzLmV1LXdlc3QtMS5jb21wdXRlLmlu
-						dGVybmFsMB0GA1UdDgQWBBT2pR0g9K3m7Y6bIq/RsoOj6lHjUTANBgkqhkiG9w0B
-						AQUFAAOCAQEANTAPP0B5Uh4eRpl2qmgeS4m+c0wNvYOeApgytH9UiCouivZrfx1x
-						0/0PUaF0rSnVjcGaGNVBkWh6Lj6ghfVis2BUa4McyetgsV1KmSsrrN+AtlK3WXkf
-						WLd6WQ/fB3FQ7gPEczRULjS6/tOrr3o96KW2ANkEZE3xjZi0YDC89dlEsESdojr4
-						icU0w5Hh2enXVym/rIrPReK+G19phnsZFw1AhSXQmhq0L1x4f0XQMHj0C2QDlJOD
-						SyG+rbw/0u9SeNx/iMZKa1qKz9WEOj6CZGh83bW8OneXzP04/g98kWgQ7FIAzYYb
-						zEv3N6DD8ZWFPrnpVVTE8F0rXeUFmbax4g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Boardworks Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Boardworks Limited: MyWorks Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.myworks.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Catherine</GivenName>
-    <SurName>Marks</SurName>
-    <EmailAddress>mailto:catherine.marks@boardworks.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Catherine</GivenName>
-    <SurName>Marks</SurName>
-    <EmailAddress>mailto:catherine.marks@boardworks.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>