Skip to content

Commit 95d5c40

Browse files
committed
Clean up remaining merge conflict marker in Project.toml
1 parent f75223a commit 95d5c40

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

Project.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ Aqua = "0.8"
7373
ArrayInterface = "7.7"
7474
BandedMatrices = "1.5"
7575
blis_jll = "0.9.0"
76-
<<<<<<< HEAD
7776
BlockDiagonals = "0.1.42, 0.2"
7877
CUDA = "5"
7978
CUDSS = "0.1, 0.2, 0.3, 0.4"

0 commit comments

Comments
 (0)