Resolve conflicts in app/assets/javascripts/pipelines/pipeline_details_bundle.js

a79ccc31 · Stan Hu · 8bc8afa1 · a79ccc31
Commit a79ccc31 authored Feb 28, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/pipelines/pipeline_details_bundle.js app/assets/javascripts/pipelines/pipeline_details_bundle.js +0 -3

No files found.
--- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js
+++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
@@ -73,7 +73,6 @@ export default () => {
      });
    },
  });
-<<<<<<< HEAD

  /**
   * EE only
@@ -143,6 +142,4 @@ export default () => {
      },
    });
  }
-=======
->>>>>>> upstream/master
 };