diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-06-09 17:59:18 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-06-09 17:59:18 +0200 |
| commit | 41820db4f58341575b776570c0e138d79552d156 (patch) | |
| tree | 10adf94559697c8eace6faaa63676fb076d10feb /swamid-1.0.mxml | |
| parent | cff06b3d1692b965abb45a542405c65af23137b2 (diff) | |
| parent | ec2dc19be2988b18a461cabf9c75d736ae2789a6 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-1.0.mxml
Diffstat (limited to 'swamid-1.0.mxml')
| -rw-r--r-- | swamid-1.0.mxml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml index 966760dc..0a4b95d7 100644 --- a/swamid-1.0.mxml +++ b/swamid-1.0.mxml @@ -172,8 +172,8 @@ <xi:include href="swamid-1.0/www.servicedesk.its.umu.se.xml"/> <xi:include href="swamid-1.0/umdac-olho0001.ad.umu.se.xml"/> <xi:include href="swamid-1.0/www.wisum.its.umu.se.xml"/> - <xi:include href="swamid-1.0/mds.nordu.net.xml"/> <xi:include href="swamid-1.0/kiladokdev.it.ki.se.xml"/> <xi:include href="swamid-1.0/kiladoktest.it.ki.se.xml"/> <xi:include href="swamid-1.0/lpw.ki.se.xml"/> + <xi:include href="swamid-1.0/nordunet.tv.xml"/> </EntitiesDescriptor> |