Skip to content

Commit b882296

Browse files
authored
Update pyproject.toml: remove merge conflict
1 parent aad8f09 commit b882296

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

pyproject.toml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,11 @@ dill = "^0.3.8"
4949
tqdm-multiprocess = "^0.0.11"
5050
cirron = "^0.4"
5151
eintorch = "^0.2.5"
52-
<<<<<<< HEAD
5352
numpy = "^2.0.1"
5453
tikzplotlib-patched = "^0.10.1.post13"
5554
datasets = "^3.0.0"
56-
||||||| parent of 7287967 (added stuff)
57-
numpy = "^2.0.1"
58-
tikzplotlib-patched = "^0.10.1.post6"
59-
datasets = "^2.21.0"
60-
=======
61-
numpy = "^1.10"
62-
tikzplotlib-patched = "^0.10.1.post6"
63-
datasets = "^2.21.0"
6455
circuitsvis = "^1.43.2"
6556
plotly-gif = "^0.0.4"
66-
>>>>>>> 7287967 (added stuff)
6757

6858
[tool.poetry.group.dev.dependencies]
6959
pre-commit = "^4.0.0"

0 commit comments

Comments
 (0)