Backport PR matplotlib#23705: DOC: Added link to class under discussion

story645 · melissawm · commit fbb92c4dd1c0 · 2022-12-19T19:08:03.000-03:00
diff --git a/tutorials/text/annotations.py b/tutorials/text/annotations.py
@@ -443,7 +443,11 @@
 # ~~~~~~~~~~~~~~~~~~~~~
 #
 # `.ConnectionPatch` is like an annotation without text. While `~.Axes.annotate`
+<<<<<<< HEAD
 # is sufficient in most situations, `.ConnectionPatch` is useful when you want to
+=======
+# is sufficient in most situations, ``ConnectionPatch`` is useful when you want to
+>>>>>>> 056eb64245 (Backport PR #23705: DOC: Added link to class under discussion)
 # connect points in different axes. ::
 #
 #   from matplotlib.patches import ConnectionPatch
@@ -459,7 +463,11 @@
 #    :target: ../../gallery/userdemo/connect_simple01.html
 #    :align: center
 #
+<<<<<<< HEAD
 # Here, we added the `.ConnectionPatch` to the *figure* (with `~.Figure.add_artist`)
+=======
+# Here, we added the ``ConnectionPatch`` to the *figure* (with `~.Figure.add_artist`)
+>>>>>>> 056eb64245 (Backport PR #23705: DOC: Added link to class under discussion)
 # rather than to either axes: this ensures that it is drawn on top of both axes,
 # and is also necessary if using :doc:`constrained_layout
 # </tutorials/intermediate/constrainedlayout_guide>` for positioning the axes.
