DOC fix merge conflict

scikit-learn-contrib · Jul 8, 2023 · 20ba698 · 20ba698
1 parent 3fbcda6
commit 20ba698
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/doc/whats_new/v0.11.rst b/doc/whats_new/v0.11.rst
@@ -67,10 +67,7 @@ Enhancements
 - :class:`~imblearn.over_sampling.SMOTENC` now support passing array-like of `str`
   when passing the `categorical_features` parameter.
   :pr:`1008` by :user`Guillaume Lemaitre <glemaitre>`.
-<<<<<<< HEAD
 
 - :class:`~imblearn.over_sampling.SMOTENC` now support automatic categorical inference
   when `categorical_features` is set to `"auto"`.
   :pr:`1009` by :user`Guillaume Lemaitre <glemaitre>`.
-=======
->>>>>>> origin/master