Skip to content

Conversation

@RolandGuijt
Copy link
Contributor

No description provided.

@RolandGuijt RolandGuijt requested a review from maartenba January 8, 2026 14:43
Copy link
Member

@maartenba maartenba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you look at conflicting changes here?

# Conflicts:
#	IdentityServer/v7/Configuration/PipelineRegistration/IdentityServer/Pages/SecurityHeadersAttribute.cs
#	IdentityServer/v7/Configuration/PipelineRegistration/IdentityServer/Pages/TestUsers.cs
#	IdentityServer/v7/Configuration/SimpleDcr/IdentityServer/Pages/SecurityHeadersAttribute.cs
#	IdentityServer/v7/Configuration/SimpleDcr/IdentityServer/Pages/TestUsers.cs
#	IdentityServer/v7/Configuration/SoftwareStatement/IdentityServer/Pages/SecurityHeadersAttribute.cs
#	IdentityServer/v7/Configuration/SoftwareStatement/IdentityServer/Pages/TestUsers.cs
@RolandGuijt
Copy link
Contributor Author

@maartenba Done!

Copy link
Member

@maartenba maartenba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sweet, thanks!

@RolandGuijt RolandGuijt merged commit 366482a into main Jan 8, 2026
3 checks passed
@RolandGuijt RolandGuijt deleted the roland/configurationsamples branch January 8, 2026 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants