Skip to content
Commit 1e8577ee authored by Edgar Reehuis's avatar Edgar Reehuis
Browse files

Merge branch 'revert_default_merge_strategy_changelog' into 'main' 

Reverting back to default merge strategy for CHANGELOG.md

See merge request !659
parents 3d4db1c9 d349bb9b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment