Resolve conflicts on app/assets/javascripts/build.js

app/assets/javascripts/build.js

@@ -82,7 +82,6 @@ window.Build = (function () {
 
   Build.prototype.getBuildTrace = function () {
     return $.ajax({
-<<<<<<< HEAD
       url: `${this.pageUrl}/trace.json`,
       dataType: 'json',
       data: {
@@ -93,15 +92,6 @@ window.Build = (function () {
 
         if (log.state) {
           this.state = log.state;
-=======
-      url: this.pageUrl + "/trace.json",
-      dataType: 'json',
-      success: function(buildData) {
-        $('.js-build-output').html(buildData.html);
-        gl.utils.setCiStatusFavicon(`${this.pageUrl}/status.json`);
-        if (window.location.hash === DOWN_BUILD_TRACE) {
-          $("html,body").scrollTop(this.$buildTrace.height());
->>>>>>> origin/master
         }
 
         if (log.append) {