remove merge conflict lines

Author: hasnain2808

doc/source/whatsnew/v1.1.0.rst

@@ -288,7 +288,6 @@ Other enhancements
 - :meth:`HDFStore.put` now accepts `track_times` parameter. Parameter is passed to ``create_table`` method of ``PyTables`` (:issue:`32682`).
 - Make :class:`pandas.core.window.Rolling` and :class:`pandas.core.window.Expanding` iterable（:issue:`11704`)
 - Make ``option_context`` a :class:`contextlib.ContextDecorator`, which allows it to be used as a decorator over an entire function (:issue:`34253`).
-- :meth:`~pandas.io.json.read_json` now accepts `nrows` parameter. (:issue:`33916`).
 
 .. ---------------------------------------------------------------------------