# Conflicts: # backend/strapi/src/api/note/content-types/note/schema.json # frontend/svelte/package-lock.json # frontend/svelte/src/routes/editor/+page.svelte |
||
|---|---|---|
| .. | ||
| models | ||
| resources/images | ||
| routes | ||
| app.d.ts | ||
| app.html | ||
# Conflicts: # backend/strapi/src/api/note/content-types/note/schema.json # frontend/svelte/package-lock.json # frontend/svelte/src/routes/editor/+page.svelte |
||
|---|---|---|
| .. | ||
| models | ||
| resources/images | ||
| routes | ||
| app.d.ts | ||
| app.html | ||