Fix conflict in app/views/admin/application_settings/_ci_cd.html.haml

8a999fd1 · Clement Ho · a385c45d · 8a999fd1
Commit 8a999fd1 authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/admin/application_settings/_ci_cd.html.haml app/views/admin/application_settings/_ci_cd.html.haml +0 -3

No files found.
--- a/app/views/admin/application_settings/_ci_cd.html.haml
+++ b/app/views/admin/application_settings/_ci_cd.html.haml
@@ -23,12 +23,9 @@
          = f.label :shared_runners_enabled do
            = f.check_box :shared_runners_enabled
            Enable shared runners for new projects
-<<<<<<< HEAD

    = render 'shared_runners_minutes_setting', form: f

-=======
->>>>>>> gitlab-ce/master
    .form-group.row
      = f.label :shared_runners_text, class: 'col-form-label col-sm-2'
      .col-sm-10