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

parent fd40843a
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
= render "projects/default_branch/show" = render "projects/default_branch/show"
<<<<<<< HEAD
= render "projects/push_rules/index" = render "projects/push_rules/index"
=======
>>>>>>> upstream/master
= render "projects/mirrors/show" = render "projects/mirrors/show"
-# Protected branches & tags use a lot of nested partials. -# Protected branches & tags use a lot of nested partials.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment