Normalize parameter of value_counts edited.

Author: Keramatfar

doc/source/whatsnew/v3.0.0.rst

@@ -38,11 +38,7 @@ Other enhancements
 - :meth:`Index.get_loc` now accepts also subclasses of ``tuple`` as keys (:issue:`57922`)
 - :meth:`Styler.set_tooltips` provides alternative method to storing tooltips by using title attribute of td elements. (:issue:`56981`)
 - Added missing parameter ``weights`` in :meth:`DataFrame.plot.kde` for the estimation of the PDF (:issue:`59337`)
-<<<<<<< HEAD
 - Added a new ``keep`` option to the ``normalize`` parameter of the value_counts function. This new option allows both normalized and unnormalized values to be displayed in a tuple format. (contributed by: keramatfar)
-=======
-- Added a new ``keep`` option to the `normalize`` parameter of the ``value_counts`` function. This new option allows both normalized and unnormalized values to be displayed in a tuple format. (contributed by: keramatfar)
->>>>>>> d63cedb55de06cd0ddbb4e5857a101284e9c79d9
 - Allow dictionaries to be passed to :meth:`pandas.Series.str.replace` via ``pat`` parameter (:issue:`51748`)
 - Support passing a :class:`Series` input to :func:`json_normalize` that retains the :class:`Series` :class:`Index` (:issue:`51452`)
 - Support reading value labels from Stata 108-format (Stata 6) and earlier files (:issue:`58154`)