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

Add pizza-wielding parrot. #34

Merged
merged 2 commits into from
Sep 2, 2016
Merged

Add pizza-wielding parrot. #34

merged 2 commits into from
Sep 2, 2016

Conversation

chalisegrogan
Copy link
Contributor

Because, well, pizza.

@@ -90,6 +90,7 @@
<li><img src="parrots/congaparrot.gif" alt="Conga Line Parrot"/> Conga Line Parrot<span tooltip="A self sufficient conga line parrot!">*</span></li>
<li><img src="parrots/reversecongaparrot.gif" alt="Reverse Conga Line Parrot"/> Reverse Conga Line Parrot</li>
<li><img src="parrots/partyparrot.gif" alt="Party Parrot"/> Party Parrot</li>
<li><img src="parrots/partyparrot.gif" alt="Pizza Parrot"/> Pizza Parrot</li>

Choose a reason for hiding this comment

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

This is the same src. Shouldn't it be pizzaparrot.gif?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch. 🍕

@jmhobbs jmhobbs added the AWESOME label Sep 1, 2016
@jmhobbs
Copy link
Owner

jmhobbs commented Sep 1, 2016

Hey @chalisegrogan!

I merged a different commit which had a zip file update and now your PR is broken. Could you rebase or perhaps just remove the zip file change from the commit?

Sorry!

@chalisegrogan
Copy link
Contributor Author

@jmhobbs No problem! The zip is removed.

@jmhobbs
Copy link
Owner

jmhobbs commented Sep 2, 2016

Thank you!

@jmhobbs jmhobbs merged commit c6e64b8 into jmhobbs:master Sep 2, 2016
@chalisegrogan chalisegrogan deleted the pizza-parrot branch December 15, 2016 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants