Fix conflict in app/views/admin/requests_profiles/index.html.haml

62a794c1 · Clement Ho · 913bdd85 · 62a794c1
Commit 62a794c1 authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/admin/requests_profiles/index.html.haml app/views/admin/requests_profiles/index.html.haml +0 -4

No files found.
--- a/app/views/admin/requests_profiles/index.html.haml
+++ b/app/views/admin/requests_profiles/index.html.haml
@@ -13,11 +13,7 @@
  - if @profiles.present?
    .prepend-top-default
      - @profiles.each do |path, profiles|
-<<<<<<< HEAD
-        .card.panel-small
-=======
        .card.card-small
->>>>>>> gitlab-ce/master
          .card-header
            %code= path
          %ul.content-list