diff options
| author | Leif Johansson <leifj@sunet.se> | 2010-11-25 17:19:18 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2010-11-25 17:19:18 +0100 |
| commit | 9a1faee8dc63c0277558b14ba42021f20d506b2f (patch) | |
| tree | 6a0d7f00bb1b8d029a938e2a14fe969568f45c1c | |
| parent | fa61fd42bd784959d47a3b6fb0e06516d7eee7a2 (diff) | |
| parent | fd8247c5f1df53189d62ae73723413446c75ec84 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-1.0.mxml
| -rw-r--r-- | swamid-1.0-testing.mxml | 1 | ||||
| -rw-r--r-- | swamid-1.0.mxml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/swamid-1.0-testing.mxml b/swamid-1.0-testing.mxml index a4f04ba9..7830c843 100644 --- a/swamid-1.0-testing.mxml +++ b/swamid-1.0-testing.mxml @@ -59,5 +59,4 @@ <xi:include href="swamid-1.0/kurser.math.su.se.xml"/> <xi:include href="swamid-1.0/webwork.math.su.se.xml"/> <xi:include href="swamid-1.0/idp1.unit.liu.se.xml"/> - <xi:include href="swamid-1.0/smd-dev.nordu.net.xml"/> </EntitiesDescriptor> diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml index dbf72655..e64fe571 100644 --- a/swamid-1.0.mxml +++ b/swamid-1.0.mxml @@ -170,4 +170,5 @@ <xi:include href="swamid-1.0/sp-test.it.su.se.xml"/> <xi:include href="swamid-1.0/www.studera.nu.xml"/> <xi:include href="swamid-1.0/mondo-test.su.se.xml"/> + <xi:include href="swamid-1.0/smd-dev.nordu.net.xml"/> </EntitiesDescriptor> |