Skip to content

Commit 2355fc5

Browse files
committed
remove conflict
1 parent c010399 commit 2355fc5

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

doc/source/whatsnew/v1.1.0.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ Other enhancements
236236
and :class:`~pandas.io.stata.StataWriterUTF8` (:issue:`26599`).
237237
- :meth:`HDFStore.put` now accepts `track_times` parameter. Parameter is passed to ``create_table`` method of ``PyTables`` (:issue:`32682`).
238238
- Make :class:`pandas.core.window.Rolling` and :class:`pandas.core.window.Expanding` iterable(:issue:`11704`)
239-
- :meth:`~pandas.io.json.read_json` now accepts `nrows` parameter. (:issue:`33916`).
240239

241240
.. ---------------------------------------------------------------------------
242241

0 commit comments

Comments
 (0)