RR - Resolve merge conflict

robrighter · robrighter · commit 9d827a8f2b0c · 2023-02-21T06:58:32.000-05:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -2156,7 +2156,7 @@ def __init__(self, parent, subplotspec, *,
             be placed.
 
         facecolor : default: ``"none"``
-            Transparent face color.
+            The figure patch face color; transparent by default.
 
         edgecolor : default: :rc:`figure.edgecolor`
             The figure patch edge color.
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -287,11 +287,6 @@ def test_suptitle_fontproperties():
     assert txt.get_weight() == fps.get_weight()
 
 
-<<<<<<< HEAD
-@image_comparison(['figure_suptitle_subfigures'],
-                  extensions=['png'])
-=======
->>>>>>> bb69a2fbc5 (RR - convert visual test to simple unit test.)
 def test_suptitle_subfigures():
     fig = plt.figure(figsize=(4, 3))
     sf1, sf2 = fig.subfigures(1, 2)
