Resolve CE-EE conflict in app/views/projects/_home_panel.html.haml

app/views/projects/_home_panel.html.haml

@@ -63,7 +63,6 @@
         - else
           - deleted_message = s_('ForkedFromProjectPath|Forked from %{project_name} (deleted)')
           = deleted_message % { project_name: fork_source_name(@project) }
-<<<<<<< HEAD
 
     - if @project.mirror?
       - import_url = @project.safe_import_url
@@ -71,8 +70,6 @@
         Mirrored from #{link_to import_url, import_url}.
         %br
         = render "shared/mirror_status"
-=======
->>>>>>> upstream/master
 
   - if @project.badges.present?
     .project-badges.mb-2