Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove leftover merge conflict line from setup script. #2141

Merged
merged 1 commit into from
May 28, 2024
Merged

Remove leftover merge conflict line from setup script. #2141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion setup_venv.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,4 @@ pip install wheel
pip install --pre -r requirements.txt
pip install -e .

>>>>>>> 0c904eb7 (Shark Studio SDXL support, HIP driver support, simpler device info, small fixes)
Write-Host "Source your venv with ./shark.venv/Scripts/activate"
Loading