# Conflicts: # package.json # packages/backend/src/server/api/endpoints/admin/emoji/add.ts # packages/frontend/src/components/MkMenu.vue |
||
|---|---|---|
| .. | ||
| backend | ||
| frontend | ||
| misskey-js | ||
| shared | ||
| sw | ||
| meta.json | ||
# Conflicts: # package.json # packages/backend/src/server/api/endpoints/admin/emoji/add.ts # packages/frontend/src/components/MkMenu.vue |
||
|---|---|---|
| .. | ||
| backend | ||
| frontend | ||
| misskey-js | ||
| shared | ||
| sw | ||
| meta.json | ||