Skip to content
This repository has been archived by the owner on Aug 20, 2023. It is now read-only.

adding pixel #2060

Merged
merged 6 commits into from
May 8, 2020
Merged

adding pixel #2060

merged 6 commits into from
May 8, 2020

Conversation

ToeFrog
Copy link
Contributor

@ToeFrog ToeFrog commented Apr 22, 2020

Pixels!

Checklist

  • I ran npm test locally and it passed without errors.
  • I only edited the _data/pixels.json file.
  • I entered the username in the pixels.json that I'm also using to create this pull request.
  • I acknowledge that all my contributions will be made under the project's license.

Pixels!
Copy link
Member

@dkundel dkundel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ToeFrog! Thanks for your PR. Part of the CI is busted at the moment so I'll have to merge your PR manually. For me to do so, can you please pick another pixel that is unique? meaning the x and y values can't be taken yet.
Cheers,
Dominik

This reverts commit 72466e5.
Needed to be unique.
@ToeFrog
Copy link
Contributor Author

ToeFrog commented Apr 22, 2020

Oops. Updated.

@mergify
Copy link
Contributor

mergify bot commented Apr 28, 2020

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

@mergify
Copy link
Contributor

mergify bot commented Apr 30, 2020

Unfortunately the automatic code review has failed. Please click the details button for more information. If the details reveal a fail in Danger please note that there is currently a known issue (#2046) and @dkundel will merge your PR manually in the coming days. Sorry for the inconvenience.

@mergify mergify bot added the needs-help label Apr 30, 2020
@mergify
Copy link
Contributor

mergify bot commented Apr 30, 2020

Unfortunately the automatic code review has failed. Please click the details button for more information. If the details reveal a fail in Danger please note that there is currently a known issue (#2046) and @dkundel will merge your PR manually in the coming days. Sorry for the inconvenience.

@dkundel dkundel merged commit c14bf88 into twilio-labs:master May 8, 2020
@welcome
Copy link

welcome bot commented May 8, 2020

Congratulations on your first contribution to the Open Pixel Art project!
If you are on the look out for more ways to contribute to open-source, check out a list of some of our repositories at https://github.com/twilio/opensource.
And if you love Twilio as much as we do, make sure to check out our Twilio Champions program!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants