Skip to content

Conversation

sungam3r
Copy link
Contributor

No description provided.

# Conflicts:
#	sample/Sample/Sample.csproj
#	src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj
#	src/Serilog.Settings.Configuration/Settings/Configuration/ObjectArgumentValue.cs
#	test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj
#	test/TestApp/TestApp.csproj
@sungam3r
Copy link
Contributor Author

sungam3r commented Dec 1, 2024

@nblumhardt I have resolved conflicts.

# Conflicts:
#	test/Serilog.Settings.Configuration.Tests/Approval/ApiApprovalTests.cs
@nblumhardt nblumhardt merged commit dfb4df4 into serilog:dev Dec 3, 2024
1 check passed
@nblumhardt nblumhardt mentioned this pull request Dec 6, 2024
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