mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
YoheiZuho 2023-12-31 11:46:54 +00:00
parent 0190688af0
commit 57eed5696e
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/serializers/rest/instance_serializer.rb
View File

@ -11,11 +11,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
attributes :domain, :title, :version, :source_url, :description, attributes :domain, :title, :version, :source_url, :description,
:usage, :thumbnail, :languages, :configuration, :usage, :thumbnail, :languages, :configuration,
<<<<<<< HEAD
:registrations, :feature_quote, :fedibird_capabilities :registrations, :feature_quote, :fedibird_capabilities
=======
:registrations, :fedibird_capabilities
>>>>>>> 5c5b42d42c (Fix third party app emoji reaction feature)
has_one :contact, serializer: ContactSerializer has_one :contact, serializer: ContactSerializer
has_many :rules, serializer: REST::RuleSerializer has_many :rules, serializer: REST::RuleSerializer