# Conflicts: # package.json # packages/backend/src/server/api/endpoints/notes/create.ts # packages/frontend/src/components/MkEmojiPicker.vue # packages/frontend/src/components/MkTimeline.vue # packages/frontend/src/pages/settings/theme.vue
# Conflicts: # package.json # packages/backend/src/server/api/endpoints/notes/create.ts # packages/frontend/src/components/MkEmojiPicker.vue # packages/frontend/src/components/MkTimeline.vue # packages/frontend/src/pages/settings/theme.vue