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

d92f177a · Winnie Hellmann · f3c13090 · d92f177a
Commit d92f177a authored Jul 10, 2018 by Winnie Hellmann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/environments/components/environment_item.vue .../javascripts/environments/components/environment_item.vue +0 -3

No files found.
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -443,12 +443,9 @@ export default {
    onClickFolder() {
      eventHub.$emit('toggleFolder', this.model);
    },
-<<<<<<< HEAD
    toggleDeployBoard() {
      eventHub.$emit('toggleDeployBoard', this.model);
    },
-=======
->>>>>>> upstream/master
  },
 };
 </script>