# Conflicts: # backend/strapi/src/api/note/content-types/note/schema.json # frontend/svelte/package-lock.json # frontend/svelte/src/routes/editor/+page.svelte |
||
|---|---|---|
| .. | ||
| editor | ||
| login | ||
| register | ||
| +page.svelte | ||
| +page.ts | ||
# Conflicts: # backend/strapi/src/api/note/content-types/note/schema.json # frontend/svelte/package-lock.json # frontend/svelte/src/routes/editor/+page.svelte |
||
|---|---|---|
| .. | ||
| editor | ||
| login | ||
| register | ||
| +page.svelte | ||
| +page.ts | ||