resolve conflicts and merge

1 files changed, 0 insertions, 65 deletions

diff --git a/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 74fd02e7..00000000
--- a/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranet.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Balliol Intranet SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:53:04Z"/>
-  </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://intranet.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAOwRlblp/LXWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWludHJhbmV0LmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1NTA2WhcN
-						MjIwNDE1MjA1NTA2WjAkMSIwIAYDVQQDExlpbnRyYW5ldC5iYWxsaW9sLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwL6S+yOh34IjmsZs
-						TrXKdS8/zYgSAvWJeY3UcN3rMyzWwQYuLdZUl05bWVgBW537kFwnIBcYhgOnKGt3
-						RAJZozV56f6CSgPoZ4o2L88xEpKkoG6/o6N0Jkg29Ljxlm50NOtCb1UsV0BNFOXi
-						y7zrVR2fF/MWTSySj0HulN8FhbhOFhlIV2FQOsSg/C2aZFtvNghQJfxSG69kDSXY
-						LOwlCjEGGjnExfMW/sXvZdDR9hRRALQ6J1RMqTGegciqIp7g7brzKWbB+S+ki4ys
-						rPQ/3SKoK7Iof9iK+MCyV7A2mNc/DbcdzvTsRSfBYb0jThNzmSpfhgcRq6BZCVPf
-						H6sCXwIDAQABo0cwRTAkBgNVHREEHTAbghlpbnRyYW5ldC5iYWxsaW9sLm94LmFj
-						LnVrMB0GA1UdDgQWBBQ9zyb5zExfVTLeIqsAs7Q5I2aZTTANBgkqhkiG9w0BAQUF
-						AAOCAQEAWjRkul6zFV8UhblhJk5sdrkODZb+vtp7UYQpn77tgDl8ELZxLdHqG3K0
-						Xflyy9KNxBOg79k1sSveHVKrQ4J0VxBfXyIBZaJV3sal3v2Ck8nm6g/0NwdZRhV8
-						yW+7rGDdzYDShpxhRnbHTZ/prlR1fT0pbUFgmqa7ea4DyoOOZndZI/glh0LLjH1W
-						MRo3TPdgGytJBLS1Ii8Kgujc8zYy82yBtytw/iw6aqRFMK1jaVdDsDNW0fZY84C6
-						6EroyluFZnuwVFP5KuAz1NWnBKBqkboQyDgYhvIVQ9qYV3pykcWIyXzSCoixNyIE
-						k4rhTMQ1dT+zT8nwSPUV6q5j1PQYPg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.balliol.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: Balliol Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>