merge conflict

Schmittyapolis · Aug 2, 2012 · 518bedd · 518bedd
2 parents 858de02 + 8f95e1c
commit 518bedd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/images/13413554.gif b/images/13413554.gif
diff --git a/index.html b/index.html
@@ -59,7 +59,7 @@
   </head>
 
   <body>
-    <div id="container">
+    <div id="container"></p>
       <div class="inner">
 
         <header>
@@ -76,8 +76,10 @@ <h2>They're delicious!</h2>
         <hr>
 
         <section id="main_content">
-          <h1>Animated Pizza Gifs</h1>
-          <ul>
+            <h4>Pizza party sponsored by animatedpizzagifs.com!</h4>
+            <li>
+                <img src="images/13413554.gif" alt="pizza" />
+            </li>
             <li><img src="images/pizza-the-hut.gif" alt="pizza" /></li>
             <li><img src="images/tumblr_lfrqguYRDh1qeongvo1_500.gif" alt="pizza" /></li>
             <li><img src="images/tumblr_lfzzc9vAA81qgj5j7o1_400.gif" alt="pizza" /></li>
@@ -160,7 +162,6 @@ <h1>Animated Pizza Gifs</h1>
             <li><img src="images/tumblr_m3b2zzwFQh1r1zp7xo1_500.gif" alt="pizza" /></li>
             <li><img src="images/tumblr_lzphbt6hIo1qcr7fqo1_500.gif" alt="pizza" /></li>
             <li><img src="images/tumblr_ls83ynw7RD1qcr7fqo1_r1_500.gif" alt="pizza" /></li>
-            </ul>
         </section>
 
         <footer>