Resolve app/helpers/application_settings_helper.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve app/helpers/application_settings_helper.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
00986861 · Rémy Coutable · 4156a269 · 00986861
Commit 00986861 authored Jul 31, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 9 deletions

app/helpers/application_settings_helper.rb app/helpers/application_settings_helper.rb +0 -9

No files found.
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -239,15 +239,6 @@ module ApplicationSettingsHelper
      :signup_enabled,
      :terminal_max_session_time,
      :terms,
-<<<<<<< HEAD
-      :throttle_unauthenticated_enabled,
-      :throttle_unauthenticated_requests_per_period,
-      :throttle_unauthenticated_period_in_seconds,
-      :throttle_authenticated_web_enabled,
-      :throttle_authenticated_web_requests_per_period,
-      :throttle_authenticated_web_period_in_seconds,
-=======
->>>>>>> origin/master
      :throttle_authenticated_api_enabled,
      :throttle_authenticated_api_period_in_seconds,
      :throttle_authenticated_api_requests_per_period,