Fix app/views/projects/settings/repository/show.html.haml

2d484259 · Douglas Barbosa Alexandre · fd40843a · 2d484259
Commit 2d484259 authored Sep 05, 2018 by Douglas Barbosa Alexandre
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
@@ -3,10 +3,7 @@
 - @content_class = "limit-container-width" unless fluid_layout

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

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