From a20d8b18930e9f81efdc347ad37a036e8cec5875 Mon Sep 17 00:00:00 2001
From: Ean Garvey <87458719+monorimet@users.noreply.github.com>
Date: Tue, 28 May 2024 12:28:14 -0500
Subject: [PATCH] Remove leftover merge conflict line from setup script.

---
 setup_venv.ps1 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup_venv.ps1 b/setup_venv.ps1
index b6a6994449..40f26ecf08 100644
--- a/setup_venv.ps1
+++ b/setup_venv.ps1
@@ -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"