Skip to content

G
gitlab-ce
Commit fcd5878c authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/assets/javascripts/environments/components/environment_item.vue

parent 5ecefc54
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/environments/components/environment_item.vue
View file @ fcd5878c
...@@ -454,13 +454,10 @@ export default { ...@@ -454,13 +454,10 @@ export default {
folderIconName() { folderIconName() {
return this.model.isOpen ? 'chevron-down' : 'chevron-right'; return this.model.isOpen ? 'chevron-down' : 'chevron-right';
}, },
<<<<<<< HEAD
deployIconName() { deployIconName() {
return this.model.isDeployBoardVisible ? 'chevron-down' : 'chevron-right'; return this.model.isDeployBoardVisible ? 'chevron-down' : 'chevron-right';
}, },
=======
>>>>>>> upstream/master
}, },
methods: { methods: {
......
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