Resolving conflict _home_panel.html.haml

app/views/projects/_home_panel.html.haml

@@ -23,7 +23,6 @@
             - 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
         %p
@@ -31,8 +30,6 @@
           %br
           = render "shared/mirror_status"
 
-=======
->>>>>>> upstream/master
     .project-badges
       - @project.badges.each do |badge|
         - badge_link_url = badge.rendered_link_url(@project)