Valery Sizov
--- a/app/controllers/admin/application_settings_controller.rb

+ 1

− 5
+++ b/app/controllers/admin/application_settings_controller.rb

+ 1

− 5
 @@ -133,20 +133,16 @@ def application_setting_params
      :elasticsearch_port,
      :usage_ping_enabled,
      :enabled_git_access_protocol,
-<<<<<<< HEAD
      :repository_size_limit,
-=======
      :housekeeping_enabled,
      :housekeeping_bitmaps_enabled,
      :housekeeping_incremental_repack_period,
      :housekeeping_full_repack_period,
      :housekeeping_gc_period,
      repository_storages: [],
->>>>>>> ce/master
      restricted_visibility_levels: [],
      import_sources: [],
-      disabled_oauth_sign_in_sources: [],
-      repository_storages: []
+      disabled_oauth_sign_in_sources: []
    )
  end
 end