kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Change left and right position for parallel lines.

Browse source
This commit is contained in:
Fatih Acet 2016-08-11 21:30:34 +03:00
parent f6aa91700a
commit c9f94fec4d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/merge_conflict_data_provider.js.es6
View file

@ -95,8 +95,8 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
for (let i = 0, len = linesObj.left.length; i < len; i++) {
file.parallelLines.push([
linesObj.left[i],
linesObj.right[i]
linesObj.right[i],
linesObj.left[i]
]);
}