Skip to content

G
gitlab-ce
Commit d92f177a authored by Winnie Hellmann's avatar Winnie Hellmann
Browse files
Options

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

parent f3c13090
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/environments/components/environment_item.vue
View file @ d92f177a
...@@ -443,12 +443,9 @@ export default { ...@@ -443,12 +443,9 @@ export default {
onClickFolder() { onClickFolder() {
eventHub.$emit('toggleFolder', this.model); eventHub.$emit('toggleFolder', this.model);
}, },
<<<<<<< HEAD
toggleDeployBoard() { toggleDeployBoard() {
eventHub.$emit('toggleDeployBoard', this.model); eventHub.$emit('toggleDeployBoard', this.model);
}, },
=======
>>>>>>> upstream/master
}, },
}; };
</script> </script>
......
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