From 1db73edc5f041eb7f497a23a28da885b2a7867f3 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 21 Aug 2011 21:06:09 -0700
Subject: [PATCH] fix conflict

---
 docs/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 6be1192168..384977bb86 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1162,11 +1162,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
               </div>
             </div>
           </div>
-<<<<<<< HEAD
           <img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
-=======
-          <img class="large-bird" src="assets/img/bird.png" width="220px" height="151px">
->>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
         </div>
       </div>
     </div>