Resolve merge conflicts (merge HHS:main into adhoc:main) #484
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [validator](https://github.com/validatorjs/validator.js) from 13.6.0 to 13.7.0. - [Release notes](https://github.com/validatorjs/validator.js/releases) - [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md) - [Commits](validatorjs/validator.js@13.6.0...13.7.0) --- updated-dependencies: - dependency-name: validator dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Josh Salisbury <[email protected]>
welcoming robots in certain situations
…oved-and-created-date-to-ar
…ependabot/npm_and_yarn/validator-13.7.0
…thub.com/HHS/Head-Start-TTADP into dependabot/npm_and_yarn/validator-13.7.0
…-13.7.0 Bump validator from 13.6.0 to 13.7.0
[TTAHUB-451] Add target populations to approved report
…ed-date-to-ar [TTAHUB-430] add approved and created date to activity report tables
thewatermethod
changed the title
thewatermethod
requested review from
AdamAdHocTeam,
GarrettEHill,
jasalisbury,
kryswisnaskas and
hardwarehuman
AdamAdHocTeam
approved these changes
Nov 15, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
Merge HHS:main into adhoc:main to fix some merge conflicts between the fork and parent. Hopefully one of the last times we have to bother with this.
(All these changes were approved and merged into our HHS repo)
How to test
Issue(s)
no jira
Checklists
Every PR
Production Deploy
After merge/deploy