diff options
| author | Leif Johansson <leifj@sunet.se> | 2016-02-16 10:44:08 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2016-02-16 10:44:08 +0100 |
| commit | fbcd14f3a78a5668289306a369a284eb4b8f7031 (patch) | |
| tree | 8ff20605cc2555b18f0e3d3a01a9dfde8f85b2f6 /swamid-sp-2.0.mxml | |
| parent | 8c584b6e261c92a69e30d7e9d1e4069ea4b2ee50 (diff) | |
unconflict
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> |