fix conflicts in app/views/projects/jobs/_sidebar.html.haml

app/views/projects/jobs/_sidebar.html.haml

@@ -33,11 +33,7 @@
               = link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do
                 Download
 
-<<<<<<< HEAD
               - if @build.browsable_artifacts?
-=======
-              - if @build.artifacts_metadata?
->>>>>>> upstream/master
                 = link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default' do
                   Browse