# Conflicts: # .devcontainer/buildAppImage.sh # .github/workflows/template-tauri-build-linux-x64.yml # Makefile # core/src/node/extension/index.test.ts # package.json # src-tauri/tauri.conf.json # web-app/package.json
# Conflicts: # .devcontainer/buildAppImage.sh # .github/workflows/template-tauri-build-linux-x64.yml # Makefile # core/src/node/extension/index.test.ts # package.json # src-tauri/tauri.conf.json # web-app/package.json