fixing linting error

Koookadooo · Koookadooo · commit 5d3f5a14a173 · 2024-12-10T20:27:38.000-08:00
diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py
@@ -50,10 +50,6 @@
 )
 
 import pandas as pd
-<<<<<<< HEAD
-=======
-from pandas import Series
->>>>>>> e0062fa66ce6b25fa06dee1f447d3ed0651031ad
 import pandas._testing as tm
 from pandas.api.extensions import no_default
 from pandas.api.types import (
