Skip to content

Conversation

sungam3r
Copy link
Contributor

@sungam3r sungam3r commented Mar 14, 2023

See with Hide whitespace option. No actual code changes.

# Conflicts:
#	sample/ConsoleDemo/ConsoleDemo.csproj
#	src/Serilog.Sinks.Console/ConsoleLoggerConfigurationExtensions.cs
#	src/Serilog.Sinks.Console/Serilog.Sinks.Console.csproj
#	src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/OutputTemplateRenderer.cs
#	test/Serilog.Sinks.Console.Tests/Configuration/ConsoleLoggerConfigurationExtensionsTests.cs
#	test/Serilog.Sinks.Console.Tests/Output/OutputTemplateRendererTests.cs
#	test/Serilog.Sinks.Console.Tests/Serilog.Sinks.Console.Tests.csproj
@sungam3r
Copy link
Contributor Author

@nblumhardt I've resolved all conflicts.

# Conflicts:
#	src/Serilog.Sinks.Console/ConsoleAuditLoggerConfigurationExtensions.cs
#	src/Serilog.Sinks.Console/ConsoleLoggerConfigurationExtensions.cs
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.

1 participant