Merge branch 'da-fix-merge-conflict' into 'master'

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

See merge request gitlab-org/gitlab-ee!7253

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.