fix

app/lib/user_settings_decorator.rb

@@ -15,7 +15,6 @@ class UserSettingsDecorator
   private
 
   def process_update
-<<<<<<< HEAD
     user.settings['notification_emails'] = merged_notification_emails if change?('notification_emails')
     user.settings['interactions']        = merged_interactions if change?('interactions')
     user.settings['default_privacy']     = default_privacy_preference if change?('setting_default_privacy')
@@ -140,40 +139,6 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_crop_images'
   end
 
-<<<<<<< HEAD
-=======
-  def show_follow_button_on_timeline_preference
-    boolean_cast_setting 'setting_show_follow_button_on_timeline'
-  end
-
-  def show_subscribe_button_on_timeline_preference
-    boolean_cast_setting 'setting_show_subscribe_button_on_timeline'
-  end
-
-  def show_followed_by_preference
-    boolean_cast_setting 'setting_show_followed_by'
-  end
-
-  def follow_button_to_list_adder_preference
-    boolean_cast_setting 'setting_follow_button_to_list_adder'
-  end
-
-  def show_navigation_panel_preference
-    boolean_cast_setting 'setting_show_navigation_panel'
-  end
-
-  def show_quote_button_preference
-    boolean_cast_setting 'setting_show_quote_button'
-  end
-
-  def show_bookmark_button_preference
-    boolean_cast_setting 'setting_show_bookmark_button'
-  end
-
-  def show_target_preference
-    boolean_cast_setting 'setting_show_target'
-  end
-
   def place_tab_bar_at_bottom_preference
     boolean_cast_setting 'setting_place_tab_bar_at_bottom'
   end
@@ -182,7 +147,6 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_show_tab_bar_label'
   end
 
->>>>>>> fb196ccdb... Add place tab bar at bottom and add short label
   def boolean_cast_setting(key)
     ActiveModel::Type::Boolean.new.cast(settings[key])
   end

app/serializers/initial_state_serializer.rb

@@ -25,7 +25,6 @@ class InitialStateSerializer < ActiveModel::Serializer
     }
 
     if object.current_account
-<<<<<<< HEAD
       store[:me]                = object.current_account.id.to_s
       store[:unfollow_modal]    = object.current_account.user.setting_unfollow_modal
       store[:boost_modal]       = object.current_account.user.setting_boost_modal

config/locales/simple_form.en.yml

@@ -53,9 +53,6 @@ en:
         setting_display_media_show_all: Always show media
         setting_hide_network: Who you follow and who follows you will be hidden on your profile
         setting_noindex: Affects your public profile and status pages
-<<<<<<< HEAD
-        setting_show_application: The application you use to post will be displayed in the detailed view of your posts
-=======
         setting_place_tab_bar_at_bottom: When using a touch device, you can operate tabs within the reach of your fingers.
         setting_show_application: The application you use to toot will be displayed in the detailed view of your toots
         setting_show_bookmark_button: When turned off, the bookmark call will be in Mastodon's standard position (in the menu on the action bar)
@@ -66,7 +63,6 @@ en:
         setting_show_tab_bar_label: When adding a list etc. to the tab bar, it is recommended to display the label because it is not possible to distinguish by the icon alone
         setting_show_followed_by: "The color of the follow button changes according to the follow status (gray: no follow relationship, yellow: followed, blue: following, green: mutual follow)"
         setting_show_target: Enable the function to switch between posting target and follow / subscribe target
->>>>>>> fb196ccdb... Add place tab bar at bottom and add short label
         setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details
         setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed
         username: Your username will be unique on %{domain}