Update Doc/whatsnew/3.12.rst

timhoffm · JelleZijlstra · timhoffm · commit 5acbe3771d29 · 2023-04-30T01:23:45.000+02:00
Co-authored-by: Jelle Zijlstra &lt;jelle.zijlstra@gmail.com&gt;
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -701,14 +701,18 @@ Deprecated
   Python 3.14, when ``'data'`` filter will become the default.
   See :ref:`tarfile-extraction-filter` for details.
 
+<<<<<<< HEAD
 * ``calendar.January`` and ``calendar.February`` constants are deprecated and
   replaced by :data:`calendar.Month.JANUARY` and :data:`calendar.Month.FEBRUARY`.
   (Contributed by Prince Roshan in :gh:`103636`.)
 
 * The bitwise inversion operator (~) on bool is deprecated. It will throw an
+=======
+* The bitwise inversion operator (``~``) on bool is deprecated. It will throw an
+>>>>>>> d169b579a8 (Update Doc/whatsnew/3.12.rst)
   error in Python 3.14. Use ``not`` for logical negation of bools instead.
   In the rare case that you really need the bitwise inversion of the underlying
-  ``int``, convert to int explicitly ``~int(x)``. (Contributed by Tim Hoffmann
+  ``int``, convert to int explicitly with ``~int(x)``. (Contributed by Tim Hoffmann
   in :gh:`103487`.)
 
 Pending Removal in Python 3.13
