commit 4ab791497cf4829cc9a6fab1dda0b60bd1eae376
author Anthony Sottile <asottile@umich.edu> Sun Jan 21 15:31:23 2018 -0800
committer Anthony Sottile <asottile@umich.edu> Sun Jan 21 15:31:23 2018 -0800
tree d012e4def9691d5221ef13e723437b0ea7edb933
parent 0ddb3b8527b29e56ce97e5e8308b7a871f53b3a7

Replace deprecated yield_fixture with fixture

Committed via https://github.com/asottile/all-repos

tests/check_merge_conflict_test.py

diff --git a/tests/check_merge_conflict_test.py b/tests/check_merge_conflict_test.py
index a999aca..8a848ba 100644
--- a/tests/check_merge_conflict_test.py
+++ b/tests/check_merge_conflict_test.py
@@ -12,7 +12,7 @@
 from testing.util import write_file
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def f1_is_a_conflict_file(tmpdir):
     # Make a merge conflict
     repo1 = tmpdir.join('repo1')
@@ -67,7 +67,7 @@
         yield
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def repository_is_pending_merge(tmpdir):
     # Make a (non-conflicting) merge
     repo1 = tmpdir.join('repo1')