From 086d9d5c51e51d7cc13d50a26dd9d98836dbf565 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Sun, 8 Apr 2018 12:34:40 +0000
Subject: [PATCH] Resolve conflicts in _home_panel.html.haml
---
app/views/projects/_home_panel.html.haml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index b958952fb776..aa0326cf2b75 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/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.prepend-top-default.append-bottom-default
- @project.badges.each do |badge|
%a.append-right-8{ href: badge.rendered_link_url(@project),
--
GitLab