From 57eed5696e7db89e29b910f5fc46c9f3866deb4b Mon Sep 17 00:00:00 2001 From: YoheiZuho Date: Sun, 31 Dec 2023 11:46:54 +0000 Subject: [PATCH] fix conflict --- app/serializers/rest/instance_serializer.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index 4def393a5..498a1cc68 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -11,11 +11,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer attributes :domain, :title, :version, :source_url, :description, :usage, :thumbnail, :languages, :configuration, -<<<<<<< HEAD :registrations, :feature_quote, :fedibird_capabilities -======= - :registrations, :fedibird_capabilities ->>>>>>> 5c5b42d42c (Fix third party app emoji reaction feature) has_one :contact, serializer: ContactSerializer has_many :rules, serializer: REST::RuleSerializer