We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 403873f commit 7cfd688Copy full SHA for 7cfd688
lib/matplotlib/tests/test_datetime.py
@@ -8,16 +8,6 @@
8
9
10
class TestDatetimePlotting:
11
-<<<<<<< HEAD
12
- @pytest.mark.xfail(reason="Test for acorr not written yet")
13
- @mpl.style.context("default")
14
- def test_acorr(self):
15
- fig, ax = plt.subplots()
16
- ax.acorr(...)
17
-
18
-=======
19
- @pytest.mark.xfail(reason="Test for annotate not written yet")
20
->>>>>>> 151199a8ef (MNT: remove xcorr and acorr from test_datetime)
21
@mpl.style.context("default")
22
def test_annotate(self):
23
mpl.rcParams["date.converter"] = 'concise'
0 commit comments