Skip to content

Commit 90f363a

Browse files
authored
fix merge conflict
1 parent 2839357 commit 90f363a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

StabilityMatrix.Core/Models/Packages/RuinedFooocus.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,7 @@ public override async Task InstallPackage(
9696

9797
var requirements = new FilePath(installLocation, "requirements_versions.txt");
9898
var pipArgs = new PipInstallArgs()
99-
<<<<<<< HEAD
100-
.WithTorchExtraIndex("cu121")
101-
=======
10299
.WithTorchExtraIndex(torchExtraIndex)
103-
>>>>>>> c422920b (Merge pull request #1076 from ionite34/fix-legacy-gpu)
104100
.WithParsedFromRequirementsTxt(
105101
await requirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false),
106102
"--extra-index-url.*|--index-url.*"

0 commit comments

Comments
 (0)