Resolve conflict in app/assets/javascripts/pipelines/components/pipelines.vue

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/assets/javascripts/pipelines/components/pipelines.vue
Signed-off-by: Rémy Coutable <remy@rymai.me>
9ba243a5 · Rémy Coutable · bab361d8 · 9ba243a5
Commit 9ba243a5 authored Nov 23, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/pipelines/components/pipelines.vue app/assets/javascripts/pipelines/components/pipelines.vue +0 -3

No files found.
--- a/app/assets/javascripts/pipelines/components/pipelines.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines.vue
@@ -171,10 +171,7 @@
       */
      updateContent(parameters) {
        this.updateInternalState(parameters);
-<<<<<<< HEAD

-=======
->>>>>>> origin/master
        // fetch new data
        return this.service.getPipelines(this.requestData)
          .then((response) => {