Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Cake Parrot #491

Merged
merged 3 commits into from
Jul 22, 2020
Merged

Added Cake Parrot #491

merged 3 commits into from
Jul 22, 2020

Conversation

KoichiroGIF
Copy link
Contributor

I added Cake Parrot !

@KoichiroGIF
Copy link
Contributor Author

Is there something wrong with my file?

@jmhobbs
Copy link
Owner

jmhobbs commented Jul 22, 2020

There is a conflict caused by merging a different PR, but I should be able to fix it.

@jmhobbs jmhobbs merged commit f8cb8ad into jmhobbs:master Jul 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants