resolve conflicts on app/views/admin/health_check/show.html.haml

c0940b7f · Mario de la Ossa · cad73304 · c0940b7f
Commit c0940b7f authored Feb 05, 2018 by Mario de la Ossa
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/admin/health_check/show.html.haml app/views/admin/health_check/show.html.haml +0 -4

No files found.
--- a/app/views/admin/health_check/show.html.haml
+++ b/app/views/admin/health_check/show.html.haml
@@ -23,13 +23,9 @@
        %code= liveness_url(token: Gitlab::CurrentSettings.health_check_access_token)
      %li
        %code= metrics_url(token: Gitlab::CurrentSettings.health_check_access_token)
-<<<<<<< HEAD
      - if Gitlab::Geo.secondary?
        %li
          %code= health_check_url(token: Gitlab::CurrentSettings.health_check_access_token, checks: :geo)
-=======
->>>>>>> upstream/master
  %hr
  .panel.panel-default
    .panel-heading