resolve conflicts and merge

1 files changed, 0 insertions, 93 deletions

diff --git a/swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml b/swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml
deleted file mode 100644
index 66ee8d15..00000000
--- a/swamid-interfederations-2.0/members.myworks.co.uk-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://members.myworks.co.uk/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>
-						MIIDMDCCAhigAwIBAgIJAP1/7w+UzNYuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azAeFw0xMTA0MzAyMjU0MjNaFw0yMTA0
-						MjcyMjU0MjNaMCAxHjAcBgNVBAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeY74DchIYNTo/SCxAvbvWrqkft
-						batjLhAHZD4UOsbFVOdGHPno50QweYbOu36Uy7FzoZ1r+8/8CMUZc3zNpNaKyNWg
-						Xd7qeX9DRWVi0D4wJsRuBhzx2fTk1g2HnltqAg3ssVPyDQ70lRh019gVeBeMvm+P
-						lYWoRzoJTEl2z8hwMPGqf5oydmVCwTCRQX3CPMlY8YQKtTO//gMZcrQAen1Wn9ez
-						WMlRmouAsvnJdeaLNP32pLTWVdLJ55oHElLQTPnW/1bKY4xwsyE2DL3I0RWbksTx
-						q6onlTN92hJ05aX3o0n+8uIWaJO0UVyi8FxJ0gAIsdIDeyDt+809/Zd2XDkCAwEA
-						AaNtMGswSgYDVR0RBEMwQYIVbWVtYmVycy5teXdvcmtzLmNvLnVrhihodHRwczov
-						L21lbWJlcnMubXl3b3Jrcy5jby51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSi9ltT
-						qVMqHPMmEyiFzvZ64nzIszANBgkqhkiG9w0BAQUFAAOCAQEATztbeTRrNLBSPyjC
-						PBKTYRD0vGmU+f6OKRucwQoZrx3Zq2NdMwguQxTyF/X+6JZDXLoUqiIrxJvurzQb
-						wabd2BU8NdmZMqmCF/IQxObeRi6gWtETddI3ZGVsIp53C/QImtO/NcnV7N1Yd9bu
-						nVLntJUV5K8vV/yJfYkCgtNvZZ4ZH+0qNzWZFtMOj+5R6fUJe9Yez4/T4Ot4pjUN
-						wWebWwcZxvNH1tnZQxeOTvlzmEpvUwfR54UeQyqJCF/w/2kxlQvMDgoueWCyUQqI
-						GLAzKLRI6HmGZU/JUFbJ9qhoBEQYy3BfAIUiC3z0Cm38kIFUUNl0TIsJJ4fFskdc
-						8rYfwQ==
-					</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>
-						MIIDMDCCAhigAwIBAgIJAP1/7w+UzNYuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azAeFw0xMTA0MzAyMjU0MjNaFw0yMTA0
-						MjcyMjU0MjNaMCAxHjAcBgNVBAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeY74DchIYNTo/SCxAvbvWrqkft
-						batjLhAHZD4UOsbFVOdGHPno50QweYbOu36Uy7FzoZ1r+8/8CMUZc3zNpNaKyNWg
-						Xd7qeX9DRWVi0D4wJsRuBhzx2fTk1g2HnltqAg3ssVPyDQ70lRh019gVeBeMvm+P
-						lYWoRzoJTEl2z8hwMPGqf5oydmVCwTCRQX3CPMlY8YQKtTO//gMZcrQAen1Wn9ez
-						WMlRmouAsvnJdeaLNP32pLTWVdLJ55oHElLQTPnW/1bKY4xwsyE2DL3I0RWbksTx
-						q6onlTN92hJ05aX3o0n+8uIWaJO0UVyi8FxJ0gAIsdIDeyDt+809/Zd2XDkCAwEA
-						AaNtMGswSgYDVR0RBEMwQYIVbWVtYmVycy5teXdvcmtzLmNvLnVrhihodHRwczov
-						L21lbWJlcnMubXl3b3Jrcy5jby51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSi9ltT
-						qVMqHPMmEyiFzvZ64nzIszANBgkqhkiG9w0BAQUFAAOCAQEATztbeTRrNLBSPyjC
-						PBKTYRD0vGmU+f6OKRucwQoZrx3Zq2NdMwguQxTyF/X+6JZDXLoUqiIrxJvurzQb
-						wabd2BU8NdmZMqmCF/IQxObeRi6gWtETddI3ZGVsIp53C/QImtO/NcnV7N1Yd9bu
-						nVLntJUV5K8vV/yJfYkCgtNvZZ4ZH+0qNzWZFtMOj+5R6fUJe9Yez4/T4Ot4pjUN
-						wWebWwcZxvNH1tnZQxeOTvlzmEpvUwfR54UeQyqJCF/w/2kxlQvMDgoueWCyUQqI
-						GLAzKLRI6HmGZU/JUFbJ9qhoBEQYy3BfAIUiC3z0Cm38kIFUUNl0TIsJJ4fFskdc
-						8rYfwQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Boardworks Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Boardworks Limited: MyWorks</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>