diff options
Diffstat (limited to 'changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml')
-rw-r--r-- | changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml b/changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml deleted file mode 100644 index c3c877423ff..00000000000 --- a/changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Fix conflict resolution when files contain valid UTF-8 characters -merge_request: -author: |