From 20ba698a9b20ef8967135533f9c36d892b51ae04 Mon Sep 17 00:00:00 2001
From: Guillaume Lemaitre <g.lemaitre58@gmail.com>
Date: Sat, 8 Jul 2023 23:57:53 +0200
Subject: [PATCH] DOC fix merge conflict

---
 doc/whats_new/v0.11.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/whats_new/v0.11.rst b/doc/whats_new/v0.11.rst
index 852620a86..8acb24ab7 100644
--- 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