Resolve conflict in `app/assets/javascripts/jobs/components/sidebar_details_block.vue`

app/assets/javascripts/jobs/components/sidebar_details_block.vue

@@ -48,12 +48,8 @@ export default {
       return `${this.job.runner.description} (#${this.job.runner.id})`;
     },
     retryButtonClass() {
-<<<<<<< HEAD
-      let className = 'js-retry-button float-right btn btn-retry d-none d-md-block d-lg-block d-xl-block';
-=======
       let className =
         'js-retry-button float-right btn btn-retry d-none d-md-block d-lg-block d-xl-block';
->>>>>>> upstream/master
       className +=
         this.job.status && this.job.recoverable ? ' btn-primary' : ' btn-inverted-secondary';
       return className;