resolved

tests/feature/test_no_scenario.py

@@ -1,9 +1,6 @@
 """Test no scenarios defined in the feature file."""
 
-<<<<<<< HEAD
 import py
-=======
->>>>>>> 887dac1... Better error explanation for the steps defined outside of scenarios
 import textwrap
 
 
@@ -15,7 +12,6 @@ def test_no_scenarios(testdir):
         When bar
         Then baz
     """), 'utf-8', ensure=True)
-<<<<<<< HEAD
     testdir.makepyfile(py.code.Source("""
         from pytest_bdd import scenarios
 
@@ -25,16 +21,5 @@ def test_no_scenarios(testdir):
     result.stdout.fnmatch_lines(
         [
             '*FeatureError: Step definition outside of a Scenario or a Background.*',
-=======
-    testdir.makepyfile("""
-        from pytest_bdd import scenarios
-
-        scenarios('features')
-    """)
-    result = testdir.runpytest('-v', '-s')
-    result.stdout.fnmatch_lines(
-        [
-            '*pytest_bdd.exceptions.FeatureError: Step definition outside of a Scenario or a Background.*',
->>>>>>> 887dac1... Better error explanation for the steps defined outside of scenarios
         ],
     )