Backport PR matplotlib#23881: Fix Pillow compatibility in example

anntzer · melissawm · commit c7acc36ec1cb · 2022-12-19T19:11:40.000-03:00
diff --git a/tutorials/introductory/images.py b/tutorials/introductory/images.py
@@ -228,10 +228,14 @@
 
 img = Image.open('../../doc/_static/stinkbug.png')
 <<<<<<< HEAD
+<<<<<<< HEAD
 img.thumbnail((64, 64))  # resizes image in-place
 =======
 img.thumbnail((64, 64), Image.Resampling.LANCZOS)  # resizes image in-place
 >>>>>>> f51659f024 (Backport PR #23855: DOC: fix deprecation warnings (#23858))
+=======
+img.thumbnail((64, 64))  # resizes image in-place
+>>>>>>> 3f8939c070 (Backport PR #23881: Fix Pillow compatibility in example)
 imgplot = plt.imshow(img)
 
 ###############################################################################
