summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-08-11 13:07:03 +0200
committerLeif Johansson <leifj@sunet.se>2015-08-11 13:07:03 +0200
commitb53085c02cf81855379eb460206ee5a45abc9163 (patch)
tree5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
parente2781960bad421c50ee348dbf9300b8ea71d83b1 (diff)
parentd2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff)
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml')
-rw-r--r--swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
index bd57a217..e19db917 100644
--- a/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
@@ -76,7 +76,7 @@
<Organization>
<OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
<OrganizationDisplayName xml:lang="en">Newcastle University Wiki Server</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
<GivenName>Chris</GivenName>