Skip to content

Commit af12a53

Browse files
committed
Resolved ruff formatting error
1 parent 161b4c7 commit af12a53

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

pandas/core/arrays/base.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,6 +1064,7 @@ def interpolate(
10641064
>>> arr = pd.arrays.NumpyExtensionArray(np.array([0, 1, np.nan, 3]))
10651065
>>> arr.interpolate(
10661066
... method="linear",
1067+
<<<<<<< HEAD
10671068
... limit=3,
10681069
... limit_direction="forward",
10691070
... index=pd.Index(range(len(arr))),
@@ -1085,6 +1086,12 @@ def interpolate(
10851086
... index=pd.Index(range(len(arr))),
10861087
... limit=None,
10871088
... limit_direction="both",
1089+
=======
1090+
... axis=0,
1091+
... index=pd.Index(range(len(arr))),
1092+
... limit=None,
1093+
... limit_direction="forward",
1094+
>>>>>>> 448a75d129 (Resolved ruff formatting error)
10881095
... limit_area=None,
10891096
... copy=True,
10901097
... )

0 commit comments

Comments
 (0)