Resolve merge conflicts

jsa34 · jsa34 · commit d67a7b8ffb22 · 2024-11-13T22:37:07.000Z
diff --git a/src/pytest_bdd/parser.py b/src/pytest_bdd/parser.py
@@ -498,7 +498,7 @@ def _parse_and_add_rule(self, rule_data: GherkinRule, feature: Feature) -> None:
             keyword=rule_data.keyword,
             name=rule_data.name,
             description=rule_data.description,
-            tags=self.get_tag_names(rule_data.tags),
+            tags=get_tag_names(rule_data.tags),
             background=background,
         )
 

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ def _parse_and_add_rule(self, rule_data: GherkinRule, feature: Feature) -> None:`
`498`	`498`	`keyword=rule_data.keyword,`
`499`	`499`	`name=rule_data.name,`
`500`	`500`	`description=rule_data.description,`
`501`		`- tags=self.get_tag_names(rule_data.tags),`
	`501`	`+ tags=get_tag_names(rule_data.tags),`
`502`	`502`	`background=background,`
`503`	`503`	`)`
`504`	`504`