Permalink
Browse files

fix conflicts

  • Loading branch information...
2 parents d17ca90 + bda4527 commit 4bed310c138117ff37f7206441b542b1e24ead2e @clintecker committed Aug 4, 2012
Showing with 1 addition and 0 deletions.
  1. BIN images/infipizza.gif
  2. +1 −0 index.html
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -80,6 +80,7 @@
<h1>Animated Pizza Gifs</h1>
<ul>
<li><img src="images/tumblr_m7f7voMKwb1qz4u07o1_500.gif" alt="pizza" /></li>
+ <li><img src="images/infipizza.gif" alt="pizza" /></li>
<li><img src="images/bopping.gif" alt="pizza" /></li>
<li><img src="images/anigif_enhanced-buzz-28842-1334036712-9.gif" alt="pizza" /></li>
<li><img src="images/GUWD.gif" alt="pizza" /></li>

0 comments on commit 4bed310

Please sign in to comment.