Fix conflict in app/views/projects/wikis/git_access.html.haml

app/views/projects/wikis/git_access.html.haml

@@ -2,11 +2,7 @@
 - page_title s_("WikiClone|Git Access"), _("Wiki")
 
 .wiki-page-header.has-sidebar-toggle
-<<<<<<< HEAD
-  %button.btn.btn-default.d-block.d-lg-none.float-right.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
-=======
   %button.btn.btn-default.d-block.d-sm-block.d-md-none.float-right.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
->>>>>>> gitlab-ce/master
     = icon('angle-double-left')
 
   .git-access-header