From c9f94fec4d5d53dff6ef20d8b94691e30c758f8a Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 11 Aug 2016 21:30:34 +0300
Subject: [PATCH] Change left and right position for parallel lines.

---
 app/assets/javascripts/merge_conflict_data_provider.js.es6 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/merge_conflict_data_provider.js.es6 b/app/assets/javascripts/merge_conflict_data_provider.js.es6
index 5b46dabe431..0abee3a000f 100644
--- a/app/assets/javascripts/merge_conflict_data_provider.js.es6
+++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6
@@ -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]
         ]);
       }
 
-- 
2.30.9