diff options
Diffstat (limited to 'swamid-sp-2.0.mxml')
| -rw-r--r-- | swamid-sp-2.0.mxml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 7f14aa4f..cefeecea 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -489,9 +489,6 @@ <xi:include href="swamid-2.0/play.bth.se.xml"/> <xi:include href="swamid-2.0/test.play.bth.se.xml"/> <xi:include href="swamid-2.0/keystone.lab.cloud.ipnett.net-shibboleth.xml"/> -<<<<<<< HEAD <xi:include href="swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml"/> -======= <xi:include href="swamid-2.0/ni.sunet.se-saml2-metadata.xml"/> ->>>>>>> 0dbf6ecd33088bb2677df0a5aba31b6425996efe </md:EntitiesDescriptor> |