Skip to content

Commit 7f9e0cb

Browse files
vaibhavhrtryanreh99
authored andcommitted
Fix Type Annotation in pandas.core.accessor (pandas-dev#26147)
1 parent 38ea1f2 commit 7f9e0cb

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

pandas/core/accessor.py

+4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@
1212

1313

1414
class DirNamesMixin:
15+
<<<<<<< HEAD
1516
<<<<<<< HEAD
1617
_accessors = set() # type: Set[str]
1718
=======
1819
_accessors = frozenset()
1920
>>>>>>> c18c8be77... CLN: remove unneeded inheritance from base object (#26128)
21+
=======
22+
_accessors = set() # type: Set[str]
23+
>>>>>>> 55abdc50a... Fix Type Annotation in pandas.core.accessor (#26147)
2024
_deprecations = frozenset(
2125
['asobject', 'base', 'data', 'flags', 'itemsize', 'strides'])
2226

0 commit comments

Comments
 (0)