Merge branch 'v3.1.0rc1-branch' into asonix/downstream

2020-01-29 09:03:06 -06:00 · 2020-01-29 09:03:06 -06:00 · 8f40a2a7f8
parent 5c355cce4c e5a820e90b
commit 8f40a2a7f8
1 changed files with 4 additions and 5 deletions
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@ -129,13 +129,12 @@ class UserSettingsDecorator
    boolean_cast_setting 'setting_trends'
  end

-<<<<<<< HEAD
-  def crop_images_preference
-    boolean_cast_setting 'setting_crop_images'
-=======
  def strip_formatting_preference
    settings['setting_strip_formatting']
->>>>>>> asonix/changes
+  end
+
+  def crop_images_preference
+    boolean_cast_setting 'setting_crop_images'
  end

  def boolean_cast_setting(key)