Test that multiple conflicts are resolved

Author: QuLogic

lib/matplotlib/tests/baseline_images/test_axes/hist2d.png

@@ -1516,9 +1516,6 @@ def test_pcolormesh_log_scale(fig_test, fig_ref):
 
 @image_comparison(['pcolormesh_datetime_axis.png'], style='mpl20')
 def test_pcolormesh_datetime_axis():
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
-
     fig = plt.figure()
     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
     base = datetime.datetime(2013, 1, 1)
@@ -2799,9 +2796,6 @@ def test_contour_colorbar():
 
 @image_comparison(['hist2d.png', 'hist2d.png'], remove_text=True, style='mpl20')
 def test_hist2d():
-    # Remove this line when this test image is regenerated.
-    plt.rcParams['pcolormesh.snap'] = False
-
     np.random.seed(0)
     # make it not symmetric in case we switch x and y axis
     x = np.random.randn(100)*2+5