Skip to content

Fix merge conflict resolution when file doesn't end with a LF#3976

Merged
stefanhaller merged 4 commits intomasterfrom
fix-merge-conflict-resolution
Oct 13, 2024
Merged

Fix merge conflict resolution when file doesn't end with a LF#3976
stefanhaller merged 4 commits intomasterfrom
fix-merge-conflict-resolution

Commits

Commits on Oct 9, 2024