removed rebase marker in test_axes

larrybradley · larrybradley · commit 7cc983d14e0b · 2014-04-03T19:42:52.000-04:00
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1552,7 +1552,6 @@ def test_errorbar_limits():
     ax.set_title('Errorbar upper and lower limits')
 
 
->>>>>>> added errorbar limit test
 @image_comparison(baseline_images=['hist_stacked_stepfilled'])
 def test_hist_stacked_stepfilled():
     # make some data
