# Conflicts: # frontend/svelte/src/routes/+page.svelte # frontend/svelte/src/routes/login/+page.svelte |
||
|---|---|---|
| .. | ||
| svelte | ||
| package-lock.json | ||
# Conflicts: # frontend/svelte/src/routes/+page.svelte # frontend/svelte/src/routes/login/+page.svelte |
||
|---|---|---|
| .. | ||
| svelte | ||
| package-lock.json | ||