Fix rebase issues

Author: roberthdevries

doc/source/whatsnew/v1.1.0.rst

@@ -288,11 +288,8 @@ 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:`to_csv` now accepts an ``error`` argument (:issue:`22610`)
-- :meth:`DataFrame.to_csv` and :meth:`Series.to_csv` now accept an ``error`` argument (:issue:`22610`)
 - :meth:`DataFrame.to_csv` and :meth:`Series.to_csv` now accept an ``errors`` argument (:issue:`22610`)
 
-
 .. ---------------------------------------------------------------------------
 
 Increased minimum versions for dependencies

pandas/core/generic.py

@@ -2367,7 +2367,6 @@ def to_hdf(
         nan_rep=None,
         dropna: Optional[bool_t] = None,
         data_columns: Optional[Union[bool_t, List[str]]] = None,
-        data_columns: Optional[List[str]] = None,
         errors: str = "strict",
         encoding: str = "UTF-8",
     ) -> None: