resolve conflicts and merge

1 files changed, 0 insertions, 69 deletions

diff --git a/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 11f2c2c2..00000000
--- a/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.ibisworld.co.uk/shibboleth-sp">
-  <!--
-		This is an "IBISWorld UK" Shibboleth SP for IBISWorld.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-23T09:34:41Z"/>
-  </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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IBISWorld UK</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Welcome to IBISWorld, the UK's richest source of business and industry information.</mdui:Description>
-        <mdui:Logo height="48" width="158">https://secure.ibisworld.co.uk/img/logosmall.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <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://secure.ibisworld.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAP4Fp5haHFgMMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnNwLmliaXN3b3JsZC5jby51azAeFw0xMTA5MDYwMDQ0MTVaFw0yMTA5MDMw
-						MDQ0MTVaMB0xGzAZBgNVBAMTEnNwLmliaXN3b3JsZC5jby51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMQHhKOh5tWySehDDucIlkK15NotzimeWOnr
-						1QklBthu1UJa07hTqrBw57aMHuJ0+WI1KSz30/xfwk3mv8sB3HvSCgt9HhwFeVnJ
-						7jMmZF/MNqI/RXFtCQdVmGyBNhhU/C2n6zDVYQE4f9115r4iIcxpR6ddbL3s9B1I
-						5UDDhTTOkFXrnfdyaPWfhANdmLbjO386S5o0IdeS5+WilyEHO7Gk7tKwi4Qn9Jim
-						tnDz0UFuMgRS9yiuNepiXhReEO2QwYRw+tDfmDql3bc+lRzlaqFTX4AbJh6OdMrO
-						zcPPjsHMnlCwDyg81UYSkNsfyUjswp5UYfZhb9KAMKyXNVLcs40CAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISc3AuaWJpc3dvcmxkLmNvLnVrMB0GA1UdDgQWBBS3kV42C8Eb
-						2/LQ1U4eh6whZrS6TDANBgkqhkiG9w0BAQUFAAOCAQEAuhXSnv+l5lcCYuhfhZ2N
-						QqAgP+4kETNy9DSiOJ65IrRP8udPrC89IXfL5ypHO8fdhNOCxI8krdIH64Jm7lth
-						vDck0+gkDGLAeXVxEDczwP8O3nNWdC+fNWTgIAkyXLDS3jhJq/cwHvW1jJRdyJlQ
-						ltUXRoyxRkveiAx/M1pMtUkJGGAwAvcwutr8poLb/SwMgqnSSyDga+zXpwYqrZ8V
-						taIO6RtXMxMf+yv3uebcJiUMAUZExF8G4h6rIPSAt2Xi3oDAavBfo1ZRS0esJUL+
-						QRuvgFY9tYDxs2vrZOwMut/o9z69OWvnQoV87PqJAH1KjIQSClzrY9gj9k0aPiva
-						3w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IBISWorld</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IBISWorld UK</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ibisworld.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IBISWorld IT Team</GivenName>
-    <EmailAddress>mailto:itsupport@ibisworld.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Sells</SurName>
-    <EmailAddress>mailto:Roberts@ibisworld.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>