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

a385c45d · Clement Ho · df0cd020 · a385c45d
Commit a385c45d 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/_account_and_limit.html.haml ...s/admin/application_settings/_account_and_limit.html.haml +0 -3

No files found.
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -16,12 +16,9 @@
      = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'col-form-label col-sm-2'
      .col-sm-10
        = f.number_field :max_attachment_size, class: 'form-control'
-<<<<<<< HEAD

      = render 'repository_size_limit_setting', form: f

-=======
->>>>>>> gitlab-ce/master
    .form-group.row
      = f.label :session_expire_delay, 'Session duration (minutes)', class: 'col-form-label col-sm-2'
      .col-sm-10