Resolve stage

8ca82922 · Luke Bennett · 327574c9 · 8ca82922
Commit 8ca82922 authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

app/assets/javascripts/pipelines/components/stage.vue app/assets/javascripts/pipelines/components/stage.vue +0 -6

No files found.
--- a/app/assets/javascripts/pipelines/components/stage.vue
+++ b/app/assets/javascripts/pipelines/components/stage.vue
@@ -50,13 +50,7 @@

    computed: {
      dropdownClass() {
-<<<<<<< HEAD
        return this.dropdownContent.length > 0 ? 'js-builds-dropdown-container' : 'js-builds-dropdown-loading';
-=======
-        return this.dropdownContent.length > 0 ?
-          'js-builds-dropdown-container' :
-          'js-builds-dropdown-loading';
->>>>>>> upstream/master
      },

      triggerButtonClass() {