Skip to content

Commit 06ba9f5

Browse files
lukasbkBlake Hawkins
authored and
Blake Hawkins
committed
CLN: Type error fix in tests\tseries\offsets\test_yqm_offsets.py (pandas-dev#28996)
1 parent 1e12510 commit 06ba9f5

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

setup.cfg

-6
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,8 @@ ignore_errors=True
139139
[mypy-pandas.tests.arrays.test_datetimelike]
140140
ignore_errors=True
141141

142-
<<<<<<< HEAD
143-
[mypy-pandas.tests.arrays.test_period]
144-
ignore_errors=True
145-
146-
=======
147142
[mypy-pandas.tests.dtypes.test_common]
148143
ignore_errors=True
149-
>>>>>>> 6c898e6a5... fix #28926 mypy error in pandas\tests\arrays\test_array.py (#28970)
150144

151145
[mypy-pandas.tests.extension.decimal.test_decimal]
152146
ignore_errors=True

0 commit comments

Comments
 (0)