Resolve trace

lib/gitlab/ci/trace.rb

@@ -137,12 +137,8 @@ module Gitlab
           job.create_job_artifacts_trace!(
             project: job.project,
             file_type: :trace,
-<<<<<<< HEAD
-            file: stream)
-=======
             file: stream,
             file_sha256: Digest::SHA256.file(path).hexdigest)
->>>>>>> upstream/master
         end
       end
 

spec/lib/gitlab/ci/trace_spec.rb

@@ -413,12 +413,8 @@ describe Gitlab::Ci::Trace do
         expect(build.job_artifacts_trace.file.filename).to eq('job.log')
         expect(File.exist?(src_path)).to be_falsy
         expect(src_checksum)
-<<<<<<< HEAD
-          .to eq(Digest::SHA256.file(build.job_artifacts_trace.file.path).digest)
-=======
           .to eq(Digest::SHA256.file(build.job_artifacts_trace.file.path).hexdigest)
         expect(build.job_artifacts_trace.file_sha256).to eq(src_checksum)
->>>>>>> upstream/master
       end
     end
 
@@ -443,12 +439,8 @@ describe Gitlab::Ci::Trace do
         expect(build.job_artifacts_trace.file.filename).to eq('job.log')
         expect(build.old_trace).to be_nil
         expect(src_checksum)
-<<<<<<< HEAD
-          .to eq(Digest::SHA256.file(build.job_artifacts_trace.file.path).digest)
-=======
           .to eq(Digest::SHA256.file(build.job_artifacts_trace.file.path).hexdigest)
         expect(build.job_artifacts_trace.file_sha256).to eq(src_checksum)
->>>>>>> upstream/master
       end
     end
 
@@ -467,11 +459,7 @@ describe Gitlab::Ci::Trace do
       context 'when trace file stored in default path' do
         let!(:build) { create(:ci_build, :success, :trace_live) }
         let!(:src_path) { trace.read { |s| return s.path } }
-<<<<<<< HEAD
-        let!(:src_checksum) { Digest::SHA256.file(src_path).digest }
-=======
         let!(:src_checksum) { Digest::SHA256.file(src_path).hexdigest }
->>>>>>> upstream/master
 
         it_behaves_like 'archive trace file'
 
@@ -497,11 +485,7 @@ describe Gitlab::Ci::Trace do
       context 'when trace is stored in database' do
         let(:build) { create(:ci_build, :success) }
         let(:trace_content) { 'Sample trace' }
-<<<<<<< HEAD
-        let!(:src_checksum) { Digest::SHA256.digest(trace_content) }
-=======
         let!(:src_checksum) { Digest::SHA256.hexdigest(trace_content) }
->>>>>>> upstream/master
 
         before do
           build.update_column(:trace, trace_content)