diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
| commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
| tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-sp-2.0.mxml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-sp-2.0.mxml')
| -rw-r--r-- | swamid-sp-2.0.mxml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index e4440505..f6173077 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -118,7 +118,6 @@ <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/> <xi:include href="swamid-2.0/connect-test.sunet.se-shibboleth.xml"/> <xi:include href="swamid-2.0/converis.info-shibboleth.xml"/> - <xi:include href="swamid-2.0/sp.wavelan.su.se-shibboleth.sso.xml"/> <xi:include href="swamid-2.0/samadhi.kib.ki.se-shibboleth.xml"/> <xi:include href="swamid-2.0/tcs-test.sunet.se-shibboleth.xml"/> <xi:include href="swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/> @@ -208,7 +207,6 @@ <xi:include href="swamid-2.0/betafoo.nordu.net-saml2-metadata.xml"/> <xi:include href="swamid-2.0/vfu-test.su.se-shibboleth.sso.xml"/> <xi:include href="swamid-2.0/vfu.su.se-shibboleth.sso.xml"/> - <xi:include href="swamid-2.0/captivelan.it.su.se-shibboleth.sso.xml"/> <xi:include href="swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml"/> <xi:include href="swamid-2.0/mds2.nordu.net-shibboleth.xml"/> <xi:include href="swamid-2.0/cdn.nordunet.tv-shibboleth.xml"/> @@ -432,7 +430,7 @@ <xi:include href="swamid-2.0/brandkeeper.se-wsfed.xml"/> <xi:include href="swamid-2.0/dev.nais.uhr.se-shibboleth.xml"/> <xi:include href="swamid-2.0/www.ate.resultat.ladok.se-gui-sp.xml"/> - <xi:include href="swamid-2.0/hig.blackboard.com-shibboleth-sp.xml"/> + <xi:include href="swamid-2.0/lms.hig.se-shibboleth-sp.xml"/> <xi:include href="swamid-2.0/pera.cs.lth.se-shibboleth.xml"/> <xi:include href="swamid-2.0/se.timeedit.net-saimia-generic-sp.xml"/> <xi:include href="swamid-2.0/openarchive.ki.se-shibboleth.xml"/> @@ -454,4 +452,7 @@ <xi:include href="swamid-2.0/test.bils.se-auth-metadata.xml"/> <xi:include href="swamid-2.0/luvit.ced.lu.se-shibboleth.xml"/> <xi:include href="swamid-2.0/luvittest.ced.lu.se-shibboleth.xml"/> + <xi:include href="swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml"/> + <xi:include href="swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml"/> + <xi:include href="swamid-2.0/daisy.ict.kth.se-shibboleth.xml"/> </md:EntitiesDescriptor> |