Resolve views/projects/project_templates/_built_in_templates.html.haml

app/views/projects/project_templates/_built_in_templates.html.haml

@@ -10,17 +10,8 @@
         = template.description
     .controls.d-flex.align-items-center
       %label.btn.btn-success.template-button.choose-template.append-right-10.append-bottom-0{ for: template.name }
-<<<<<<< HEAD
-        %input{ type: "radio",  autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name,
-        data: { track_label: "create_from_template", track_property: "template_use", track_event: "click_button" } }
-        %span
-          = _("Use template")
-      %a.btn.btn-default{ href: template.preview, rel: 'noopener noreferrer', target: '_blank',
-        data: { track_label: "create_from_template", track_property: "template_preview", track_event: "click_button", track_value: template.name } }
-=======
         %input{ type: "radio",  autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name, data: { track_label: "create_from_template", track_property: "template_use", track_event: "click_button" } }
         %span
           = _("Use template")
       %a.btn.btn-default{ href: template.preview, rel: 'noopener noreferrer', target: '_blank', data: { track_label: "create_from_template", track_property: "template_preview", track_event: "click_button", track_value: template.name } }
->>>>>>> upstream/master
         = _("Preview")