Kw conflict

[kryswisnaskas]

Description of change

Following directions to resolve conflict in #483 will not work since main is a protected branch

Step 1: From your project repository, check out a new branch and test the changes.

git checkout -b adhocteam-main main
git pull https://github.com/adhocteam/Head-Start-TTADP.git main
Step 2: Merge the changes and update on GitHub.

git checkout main
git merge --no-ff adhocteam-main
git push origin main

How to test

Issue(s)

• https://ocio-jira.acf.hhs.gov/browse/TTAHUB-0

Checklists

Every PR

• [n/a] Meets issue criteria
• [ n/a] JIRA ticket status updated
• [ n/a] Code is meaningfully tested
• [ n/a] Meets accessibility standards (WCAG 2.1 Levels A, AA)
• [n/a ] API Documentation updated
• [n/a ] Boundary diagram updated
• [n/a ] Logical Data Model updated
• [ n/a] Architectural Decision Records written for major infrastructure decisions

Production Deploy

• Staging smoke test completed

After merge/deploy

• Update JIRA ticket status

[SarahJaine]

I'm not sure I fully understand how this happened, but, happy to get us back to a merge-able state.