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

fcd5878c · Stan Hu · 5ecefc54 · fcd5878c
Commit fcd5878c authored Oct 16, 2018 by Stan Hu
Show 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
@@ -454,13 +454,10 @@ export default {
    folderIconName() {
      return this.model.isOpen ? 'chevron-down' : 'chevron-right';
    },
-<<<<<<< HEAD

    deployIconName() {
      return this.model.isDeployBoardVisible ? 'chevron-down' : 'chevron-right';
    },
-=======
->>>>>>> upstream/master
  },

  methods: {