Fixes conflict for `app/assets/javascripts/environments/components/environment.vue`

c752aada · Filipa Lacerda · 79ca5df3 · c752aada
Commit c752aada authored Sep 08, 2017 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/environments/components/environment.vue ...ssets/javascripts/environments/components/environment.vue +0 -4

No files found.
--- a/app/assets/javascripts/environments/components/environment.vue
+++ b/app/assets/javascripts/environments/components/environment.vue
@@ -124,7 +124,6 @@ export default {
  },

  methods: {
-<<<<<<< HEAD

    /**
     * Toggles the visibility of the deploy boards of the clicked environment.
@@ -140,10 +139,7 @@ export default {
      }
    },

-    toggleFolder(folder, folderUrl) {
-=======
    toggleFolder(folder) {
->>>>>>> upstream/master
      this.store.toggleFolder(folder);

      if (!folder.isOpen) {