diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-20 13:17:43 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-11-20 13:23:43 +0300 |
| commit | 2e66d4cae259673b8b1ccc9838aaaa689e7b903f (patch) | |
| tree | 67b2baaf3ffb1eee639b95ade5dbef7096ffb99c /VERSION | |
| parent | 078764e4638b5b3d3c500c05d923e19a4a82b58c (diff) | |
Merge branch 'fix-conflict-highlighting' into 'master'
Fix conflict highlighting
See merge request gitlab-org/gitlab-ce!15463
(cherry picked from commit 202ab62874bb3d828ab48017550660d461e8cf6b)
64a9e53b Fix conflict highlighting
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions