# Conflicts: # CHANGELOG.md # locales/index.d.ts # locales/ja-JP.yml # packages/misskey-js/etc/misskey-js.api.md # packages/misskey-js/src/autogen/entities.ts
# Conflicts: # CHANGELOG.md # locales/index.d.ts # locales/ja-JP.yml # packages/misskey-js/etc/misskey-js.api.md # packages/misskey-js/src/autogen/entities.ts