Resolve conflicts in app/views/projects/settings/repository/show.html.haml

0e4025bd · Ash McKenzie · 9a14ed50 · 0e4025bd
Commit 0e4025bd authored May 08, 2018 by Ash McKenzie
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/projects/settings/repository/show.html.haml app/views/projects/settings/repository/show.html.haml +0 -3

No files found.
--- a/app/views/projects/settings/repository/show.html.haml
+++ b/app/views/projects/settings/repository/show.html.haml
@@ -2,10 +2,7 @@
 - page_title "Repository"
 - @content_class = "limit-container-width" unless fluid_layout

-<<<<<<< HEAD
 = render "projects/push_rules/index"
-=======
->>>>>>> upstream/master
 = render "projects/mirrors/show"

 -# Protected branches & tags use a lot of nested partials.