diff options
Diffstat (limited to 'changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml')
| -rw-r--r-- | changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml b/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml deleted file mode 100644 index eca42176501..00000000000 --- a/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Keep trailing newline when resolving conflicts by picking sides -merge_request: -author: |