summaryrefslogtreecommitdiff
path: root/swamid-2.0/openidp.feide.no.xml
diff options
context:
space:
mode:
authorBjörn Mattsson <bjorn@sunet.se>2021-03-02 15:38:19 +0100
committerBjörn Mattsson <bjorn@sunet.se>2021-03-02 15:38:19 +0100
commit7bf175cd35a758fd59c74a45231088b830245acd (patch)
tree2d963724283a330394184a34d238216182e2f311 /swamid-2.0/openidp.feide.no.xml
parent41fd08aea948243bc8cd26f4245044ecbe577363 (diff)
parentb3fae6b9dee27cb9c1e5697db048546748bcb325 (diff)
Resolved conflict
Diffstat (limited to 'swamid-2.0/openidp.feide.no.xml')
0 files changed, 0 insertions, 0 deletions