diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-04-22 15:53:58 +0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-04-22 15:53:58 +0300 |
| commit | 857e96922c0c6246075b32063514305cdcab2b87 (patch) | |
| tree | b70a5e2363039191eb3495e1d3a34ab8d0b2adff /changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml | |
| parent | a7575e1ef6199beb07a936774c9a1b4cd58e7f9c (diff) | |
Update CHANGELOG.md for 9.1.0
[ci skip]
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: |