Skip to content

Comments

Launcher/vscode#130

Open
thestumonkey wants to merge 15 commits intomainfrom
launcher/vscode
Open

Launcher/vscode#130
thestumonkey wants to merge 15 commits intomainfrom
launcher/vscode

Conversation

@thestumonkey
Copy link
Member

No description provided.

# Conflicts:
#	ushadow/launcher/package.json
#	ushadow/launcher/src-tauri/Cargo.lock
#	ushadow/launcher/src-tauri/Cargo.toml
#	ushadow/launcher/src-tauri/src/commands/prerequisites.rs
#	ushadow/launcher/src-tauri/src/models.rs
#	ushadow/launcher/src-tauri/tauri.conf.json
# Conflicts:
#	ushadow/launcher/package.json
#	ushadow/launcher/src-tauri/Cargo.lock
#	ushadow/launcher/src-tauri/Cargo.toml
#	ushadow/launcher/src-tauri/src/commands/discovery.rs
#	ushadow/launcher/src-tauri/src/commands/worktree.rs
#	ushadow/launcher/src-tauri/src/main.rs
#	ushadow/launcher/src-tauri/src/models.rs
#	ushadow/launcher/src-tauri/tauri.conf.json
#	ushadow/launcher/src/App.tsx
#	ushadow/launcher/src/components/EmbeddedView.tsx
#	ushadow/launcher/src/components/EnvironmentsPanel.tsx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant