This repository has been archived by the owner on Aug 20, 2023. It is now read-only.
Dependabot/npm and yarn/ajv 6.12.6 #6181
Open
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
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* feat(pixels): add my new pixel * feat(pixels): add my new pixel
* feat(pixels): add my new pixel * feat(pixels): add my new pixel * Update pixels.json
* feat(pixels): add my new pixel * Update pixels.json * feat(pixels): add my new pixel * feat(pixels): add my new pixel
* feat(pixels): add my own pixel * feat(pixels): add my own pixel
* feat(pixels): add my new pixel * feat(pixels): add my new pixel (again) * feat(pixels): add my new pixel Co-authored-by: Lisa Campbell <elizabeth.campbell@aya.yale.edu>
* added movlan to pixels * fixed pixel * unedited package-lock.json Co-authored-by: Bahram Movlanov <movlan@users.noreply.github.com>
* feat(pixels): add my new pixel * feat(pixels): add my new pixel * feat(pixels): add my new pixel
* feat(pixels): add my new pixel AlexanderHMagno * feat(pixels): add my new pixel AlexanderHMagno
* pixel * pixel
* updated pixels.json with new property * sorted pixels Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* new pixel4 * Conflicto de fusión resuelto incorporando ambas sugerencias
Co-authored-by: Timothy Hare <Timothyc.hare@gmail.com>
Signed-off-by: Chiara Marcial Martínez <contact@cofuente.io>
Update mock-fS to 5.1.2
Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.2 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](ajv-validator/ajv@v6.12.2...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
|
Unfortunately it seems like some other contributions have been merged since you contributed. Please resolve those merge conflicts. For more info check out this page: https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line |
|
This PR touches more than one file and has to be reviewed manually. @rmkubik |
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Feel free to open a new pull request to resubmit your contribution. Please make sure your fork is synced before opening the pull request. Thank you for your contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Checklist
npm testlocally and it passed without errors._data/pixels.jsonfile.usernamein thepixels.jsonthat I'm also using to create this pull request.