resolve conflicts and merge

1 files changed, 0 insertions, 92 deletions

diff --git a/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index e5302cab..00000000
--- a/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://exam.mvm.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 Medical student online assessment SP for the University of Edinburgh.
-	-->
-  <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">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJALQh8bzNfyAWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWV4YW0ubXZtLmVkLmFjLnVrMB4XDTExMDQwODE0MTUxM1oXDTIxMDQwNTE0
-						MTUxM1owHDEaMBgGA1UEAxMRZXhhbS5tdm0uZWQuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCeaSQzsMoZUnTOhwMymQk9Vm+FPF7jOZ10NIv/
-						P0ac9f5qjTGhlmzsnswGObNPGwE/5cXtySLww3+3C4E7RzYgfeNfdu4Gf24ZNj0A
-						lP3Pws/N+efi84aqe8Xw63HdpEE4btvVRPa85pRKV8D6yVGI+9DWs3I0UGwEoLpP
-						VfaL5eIJZXnwO1/+EI18wufQn3vtvtAF1oEwPzhsCRfmnt4hqqldHEs0XBe+5IMo
-						DMYp/+ZG7bYAAdWJ4aK1FNPdjAe4MnlyItELveVHNeVwUMcRPUXzN1pLQKFWI/X6
-						E3EJTwmRZl1IQIQBx9xpE8YX8BZZTBQuIiVmiseMdbK0p5i9AgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWV4YW0ubXZtLmVkLmFjLnVrhiRodHRwczovL2V4YW0ubXZtLmVk
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFNUzFri1AubM0m6NAuN1gi3zcwHG
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAEZXS+2a8+9rgQvK45/M56c4UkF115bfuoMHvz
-						ZvoJdWP7QUNGNQVjfQ/aonEpDpT66estmT1+Ay9M11+d0FHCWSrnVPOo7ynddrx8
-						DxWA651hLbYQCWOBPd4iZc2ccZE0P51Y0THN6DXqX45QyQWm3jqrlSbgkmVRoOeD
-						jj++u/9h5VDw6A0xnSlKdIxNR/zQ3+57KyTbctw0WRyhopVE6SLhthMVj8uz7y59
-						DK6n55hivO1qFExt6GbDOy+OpuElPY8hHkTgMXwVDXTGlc3/aTVRI/t4ckHRvMZE
-						SS5ZRxtb97uIxWPMjgimihx0qvqmmzOD1MjGAvGXoQKh5EAA
-					</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>
-						MIIDIDCCAgigAwIBAgIJALQh8bzNfyAWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWV4YW0ubXZtLmVkLmFjLnVrMB4XDTExMDQwODE0MTUxM1oXDTIxMDQwNTE0
-						MTUxM1owHDEaMBgGA1UEAxMRZXhhbS5tdm0uZWQuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCeaSQzsMoZUnTOhwMymQk9Vm+FPF7jOZ10NIv/
-						P0ac9f5qjTGhlmzsnswGObNPGwE/5cXtySLww3+3C4E7RzYgfeNfdu4Gf24ZNj0A
-						lP3Pws/N+efi84aqe8Xw63HdpEE4btvVRPa85pRKV8D6yVGI+9DWs3I0UGwEoLpP
-						VfaL5eIJZXnwO1/+EI18wufQn3vtvtAF1oEwPzhsCRfmnt4hqqldHEs0XBe+5IMo
-						DMYp/+ZG7bYAAdWJ4aK1FNPdjAe4MnlyItELveVHNeVwUMcRPUXzN1pLQKFWI/X6
-						E3EJTwmRZl1IQIQBx9xpE8YX8BZZTBQuIiVmiseMdbK0p5i9AgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWV4YW0ubXZtLmVkLmFjLnVrhiRodHRwczovL2V4YW0ubXZtLmVk
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFNUzFri1AubM0m6NAuN1gi3zcwHG
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAEZXS+2a8+9rgQvK45/M56c4UkF115bfuoMHvz
-						ZvoJdWP7QUNGNQVjfQ/aonEpDpT66estmT1+Ay9M11+d0FHCWSrnVPOo7ynddrx8
-						DxWA651hLbYQCWOBPd4iZc2ccZE0P51Y0THN6DXqX45QyQWm3jqrlSbgkmVRoOeD
-						jj++u/9h5VDw6A0xnSlKdIxNR/zQ3+57KyTbctw0WRyhopVE6SLhthMVj8uz7y59
-						DK6n55hivO1qFExt6GbDOy+OpuElPY8hHkTgMXwVDXTGlc3/aTVRI/t4ckHRvMZE
-						SS5ZRxtb97uIxWPMjgimihx0qvqmmzOD1MjGAvGXoQKh5EAA
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Medical student online assessment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lts.mvm.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MVM Learning Technology Section</GivenName>
-    <EmailAddress>mailto:mvmlts-elearning-support@lists.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Arek</GivenName>
-    <SurName>Juszczyk</SurName>
-    <EmailAddress>mailto:arek.juszczyk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>