Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
metadata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iam-pub
metadata
Commits
51a5d2d7
Commit
51a5d2d7
authored
1 year ago
by
andrew.costa
Browse files
Options
Downloads
Plain Diff
fixed merge conflicts
parents
e61ed116
588e921a
Branches
Branches containing commit
No related tags found
1 merge request
!476
Resolve "Update Support Contact for NSWERS"
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
nefed.xml
+3
-0
3 additions, 0 deletions
nefed.xml
with
3 additions
and
0 deletions
nefed.xml
+
3
−
0
View file @
51a5d2d7
...
@@ -29102,6 +29102,7 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
...
@@ -29102,6 +29102,7 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
<OrganizationDisplayName xml:lang="en">NSWERS Insights+</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">NSWERS Insights+</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://nswers.org/</OrganizationURL>
<OrganizationURL xml:lang="en">https://nswers.org/</OrganizationURL>
</Organization>
</Organization>
<<<<<<< HEAD
<ContactPerson contactType="technical">
<ContactPerson contactType="technical">
<GivenName>David Hefley</GivenName>
<GivenName>David Hefley</GivenName>
<EmailAddress>davidhefley@nebraska.edu</EmailAddress>
<EmailAddress>davidhefley@nebraska.edu</EmailAddress>
...
@@ -29119,6 +29120,8 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
...
@@ -29119,6 +29120,8 @@ Gk3Mp05d1eUmuSx+la30QAXkFgNXDP3Cp3JSKyG5A6EWjhXTyuNZcI/ffo6tjNWg
<GivenName>ITS Security</GivenName>
<GivenName>ITS Security</GivenName>
<EmailAddress>security@nebraska.edu</EmailAddress>
<EmailAddress>security@nebraska.edu</EmailAddress>
</ContactPerson>
</ContactPerson>
=======
>>>>>>> master
</EntityDescriptor>
</EntityDescriptor>
<EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
<EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment