Skip to content

G
gitlab-ce
Commit 432e276c authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

[ci skip] Fix conflict for app/assets/javascripts/ide/components/repo_editor.vue

parent edb42941
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/assets/javascripts/ide/components/repo_editor.vue
View file @ 432e276c
...@@ -17,11 +17,7 @@ export default { ...@@ -17,11 +17,7 @@ export default {
'panelResizing', 'panelResizing',
]), ]),
shouldHideEditor() { shouldHideEditor() {
<<<<<<< HEAD
return this.activeFile && this.activeFile.binary && !this.activeFile.raw; return this.activeFile && this.activeFile.binary && !this.activeFile.raw;
=======
return this.activeFile.binary && !this.activeFile.raw;
>>>>>>> upstream/master
}, },
}, },
watch: { watch: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7