resolve conflicts and merge

1 files changed, 1 insertions, 37 deletions

diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index ca347eed..be075c18 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -2,10 +2,8 @@
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-interfederations-1.0.xml">
 <xi:include href="swamid-interfederations-1.0/agw-sparknet.utu.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/atlases.muni.cz.xml"/>
 <xi:include href="swamid-interfederations-1.0/auth.asiaportal.info.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-FederationMetadata-2007-06-FederationMetadata.xml.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml"/>
@@ -26,6 +24,7 @@
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml"/>
@@ -63,97 +62,62 @@
 <xi:include href="swamid-interfederations-1.0/clarin.phonetik.uni-muenchen.de.xml"/>
 <xi:include href="swamid-interfederations-1.0/compute.deic.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/core.uwap.org.xml"/>
 <xi:include href="swamid-interfederations-1.0/data.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-1.0/dev.wiseflow.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/europe-stage.wiseflow.net.xml"/>
 <xi:include href="swamid-interfederations-1.0/europe.wiseflow.net.xml"/>
 <xi:include href="swamid-interfederations-1.0/filesender.funet.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml"/>
-<xi:include href="swamid-interfederations-1.0/foodl.org.xml"/>
 <xi:include href="swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-1.0/fse.eduuni.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/haka.saimia.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.aalto.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.abo.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.csc.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.feide.no.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.ids-mannheim.de.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.lapinamk.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.metropolia.fi-idp.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.metropolia.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.oamk.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.shh.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.tut.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.uef.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/idp.ulapland.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/infra.clarin.dk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/login.helsinki.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/logout.uwasa.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/moodle.helsinki.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/moodle.helsinki.fi.xml"/>
-<xi:include href="swamid-interfederations-1.0/moodle.utu.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/openwiki.uninett.no.xml"/>
 <xi:include href="swamid-interfederations-1.0/portal.clarin.inl.nl-.xml"/>
-<xi:include href="swamid-interfederations-1.0/portal.clarin.inl.nl.xml"/>
 <xi:include href="swamid-interfederations-1.0/repos.ids-mannheim.de-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/rr.funet.fi-attribute-test.xml"/>
-<xi:include href="swamid-interfederations-1.0/rr.funet.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/secure.huygens.knaw.nl.xml"/>
 <xi:include href="swamid-interfederations-1.0/shibboleth.bbaw.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/shibboleth.bbaw.de.xml"/>
 <xi:include href="swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/software.msdnaa.dk-.xml"/>
-<xi:include href="swamid-interfederations-1.0/software.msdnaa.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.catalog.clarin.eu.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.clarin.si-.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml"/>
-<xi:include href="swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.korp.csc.fi-.xml"/>
-<xi:include href="swamid-interfederations-1.0/sp.korp.csc.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.lat.csc.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.lux17.mpi.nl.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.vs1.corpora.uni-hamburg.de.xml"/>
 <xi:include href="swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml"/>
-<xi:include href="swamid-interfederations-1.0/sso.utu.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml"/>
-<xi:include href="swamid-interfederations-1.0/synnefo.sky.deic.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/terena.org-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/terena.org.xml"/>
 <xi:include href="swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml"/>
-<xi:include href="swamid-interfederations-1.0/tullbommen.arcada.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml"/>
 <xi:include href="swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
 <xi:include href="swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml"/>
 <xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
 <xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.xml"/>
 <xi:include href="swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
 <xi:include href="swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/wayf.card.kilroy.eu.xml"/>
 <xi:include href="swamid-interfederations-1.0/wayf.ordbogen.com.xml"/>
 <xi:include href="swamid-interfederations-1.0/wayf.wayf.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/weblicht.sfs.uni-tuebingen.de.xml"/>
 <xi:include href="swamid-interfederations-1.0/wiseflow.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.clarin-pl.eu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/www.emeraldinsight.com.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.ordbogen.com.xml"/>