Skip to content

Commit f209668

Browse files
committed
merge conflict fix
1 parent 1de096e commit f209668

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ pyarrow==7.0.0
1414
numpydoc
1515
matplotlib==3.5.1
1616
pandas==1.2.5
17-
pytest-xdist
17+
pytest-xdist=2.5.0
1818
pytest-benchmark
1919
bokeh==2.4.3

0 commit comments

Comments
 (0)