fixing merge conflicts

This commit is contained in:
lucasmbrown-usds 2022-09-30 13:43:31 -04:00
commit 07c4c030d3
266 changed files with 1868 additions and 1811 deletions

View file

@ -1,5 +1,5 @@
Feature: The Methodology page will open from all other pages
Scenario: Methodology page open when navigating from About page
Given I am on the "About" page
# When I click on the "Methodology" dropdown in the navigation
@ -11,9 +11,9 @@ Feature: The Methodology page will open from all other pages
# When I click on the "Methodology" dropdown in the navigation
When I click on the "Methodology" page in the navigation
Then I see "Methodology" in the title
Scenario: Methodology page open when navigating from Contact page
Given I am on the "Contact" page
# When I click on the "Methodology" dropdown in the navigation
When I click on the "Methodology" page in the navigation
Then I see "Methodology" in the title
Then I see "Methodology" in the title