diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-05 07:57:22 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:35 -0500 |
| commit | c4142cf9c0c0b217034c60a0a973d2e96b17a428 (patch) | |
| tree | a553a21c76861b34e09fec28ad7271d6a2bbf515 /app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | |
| parent | 4f76ff0ecd0d3b278f9722042b66d1767078ddd0 (diff) | |
| download | gitlab-ce-c4142cf9c0c0b217034c60a0a973d2e96b17a428.tar.gz | |
Improve components for PhantomJs compatibility
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 index bdd6753f66a..83bcc3f51aa 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 @@ -196,7 +196,7 @@ isHead: true, isSelected: false, isUnselected: false - } + }; }, decorateLineForInlineView(line, id, conflict) { @@ -227,7 +227,7 @@ richText: rich_text, isSelected: false, isUnselected: false - } + }; }, getOriginHeaderLine(id) { @@ -241,7 +241,7 @@ isOrigin: true, isSelected: false, isUnselected: false - } + }; }, getFilePath(file) { |