Skip to content

Commit f86c9cc

Browse files
committed
Fixed typos from rebasing
1 parent 26fbf7c commit f86c9cc

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

doc/source/whatsnew/v1.1.0.rst

-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ Indexing
301301
- Bug in :meth:`Series.xs` incorrectly returning ``Timestamp`` instead of ``datetime64`` in some object-dtype cases (:issue:`31630`)
302302
- Bug in :meth:`DataFrame.iat` incorrectly returning ``Timestamp`` instead of ``datetime`` in some object-dtype cases (:issue:`32809`)
303303
- Bug in :meth:`Series.loc` and :meth:`DataFrame.loc` when indexing with an integer key on a object-dtype :class:`Index` that is not all-integers (:issue:`31905`)
304-
<<<<<<< HEAD
305304
- Bug in :meth:`DataFrame.iloc.__setitem__` on a :class:`DataFrame` with duplicate columns incorrectly setting values for all matching columns (:issue:`15686`, :issue:`22036`)
306305
- Bug in :meth:`DataFrame.loc:` and :meth:`Series.loc` with a :class:`DatetimeIndex`, :class:`TimedeltaIndex`, or :class:`PeriodIndex` incorrectly allowing lookups of non-matching datetime-like dtypes (:issue:`32650`)
307306
- Bug in :meth:`Series.at` when used with a :class:`MultiIndex` would raise an exception on valid inputs (:issue:`26989`)

pandas/tests/indexing/test_scalar.py

-1
Original file line numberDiff line numberDiff line change
@@ -335,4 +335,3 @@ def test_multiindex_series_at_set():
335335
assert series.at[1, 3] == 3
336336
series.loc[1, 3] = 4
337337
assert series.loc[1, 3] == 4
338-

0 commit comments

Comments
 (0)