From 0f5b4d58e22857230cbd487c3a1bde7fd8a18399 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 27 Feb 2016 02:40:30 +0100
Subject: [PATCH] pytest.ini: Remove registration of flaky marker

It's already registered by the plugin.
---
 pytest.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index b0e51fdf8..e8717adef 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -8,7 +8,6 @@ markers =
     skip: Always skipped test.
     pyqt531_or_newer: Needs PyQt 5.3.1 or newer.
     xfail_norun: xfail the test with out running it
-    flaky: Tests which are flaky and should be rerun
 qt_log_level_fail = WARNING
 qt_log_ignore =
     ^SpellCheck: .*