Update tests/test_dask.py

intake · Aug 9, 2024 · 34f9f34 · 34f9f34
1 parent a8dd121
commit 34f9f34
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/test_dask.py b/tests/test_dask.py
@@ -4,11 +4,7 @@
 
 dd = pytest.importorskip("dask.dataframe")
 
-<<<<<<< HEAD
-import awkward_pandas.dask  # noqa
-=======
 import akimbo.dask  # noqa
->>>>>>> main
 
 
 def test_simple_map():