[26660] fix merge conflict from upstream

Author: jkovacevic

doc/source/whatsnew/v0.25.0.rst

@@ -97,7 +97,6 @@ Other Enhancements
 - :func:`merge_asof` now gives a more clear error message when merge keys are categoricals that are not equal (:issue:`26136`)
 - :meth:`pandas.core.window.Rolling` supports exponential (or Poisson) window type (:issue:`21303`)
 - :class:`DatetimeIndex` and :class:`TimedeltaIndex` now have a `mean` method (:issue:`24757`)
--
 - :meth:`DataFrame.describe` now formats integer percentiles without decimal point (:issue:`26660`)
 
 .. _whatsnew_0250.api_breaking: