Resolve conflict in app/views/projects/merge_requests/show.html.haml

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/projects/merge_requests/show.html.haml

@@ -22,7 +22,6 @@
     :javascript
       window.gl = window.gl || {};
       window.gl.mrWidgetData = #{serialize_issuable(@merge_request, serializer: 'widget')}
-<<<<<<< HEAD
 
       // Append static, server-generated data not included in merge request entity (EE-Only)
       // Object.assign would be useful here, but it blows up Phantom.js in tests
@@ -30,8 +29,6 @@
       window.gl.mrWidgetData.geo_secondary_help_path = '#{help_page_path("/gitlab-geo/configuration.md")}';
       window.gl.mrWidgetData.enable_squash_before_merge = '#{@merge_request.project.feature_available?(:merge_request_squash)}' === 'true';
       window.gl.mrWidgetData.squash_before_merge_help_path = '#{help_page_path("user/project/merge_requests/squash_and_merge")}';
-=======
->>>>>>> upstream/master
 
     #js-vue-mr-widget.mr-widget