# Conflicts: # .gitignore # package-lock.json # package.json # src-tauri/Cargo.lock # src-tauri/Cargo.toml # src-tauri/tauri.conf.json # src/routes/+page.svelte
# Conflicts: # .gitignore # package-lock.json # package.json # src-tauri/Cargo.lock # src-tauri/Cargo.toml # src-tauri/tauri.conf.json # src/routes/+page.svelte