#
#
# add_file "res/merging-fest-transparent.png"
#  content [02ce6b6531c15dafa4d1db24c37c7dec455f5707]
# 
# patch "index.html"
#  from [483c727b051d2ffd59a263a9adbe05372c5cf1e2]
#    to [1471dc22cd2fde71c95289f5f82be6c3ca639766]
# 
#   set "res/merging-fest-transparent.png"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# res/merging-fest-transparent.png is binary
============================================================
--- index.html	483c727b051d2ffd59a263a9adbe05372c5cf1e2
+++ index.html	1471dc22cd2fde71c95289f5f82be6c3ca639766
@@ -30,6 +30,7 @@
 </div>
 
 <div id="body">
+    <img align="right" src="res/merging-fest-transparent.png" alt="merging fest"/>
     <div class="entry newversion">
         <a href="NEWS"><b>NEWS: Wed Dec 12 2007, 0.38 release</b></a>
         <ul>
@@ -46,6 +47,8 @@
         Want to help?  <a href="irc://irc.oftc.net/monotone">join irc</a>, <a href="http://www.venge.net/mtn-wiki/QuickieTasks">pick a quickie</a> or <a href="https://savannah.nongnu.org/bugs/?group=monotone">claim a bug, write a missing test case</a>... we're friendly
     </div>
 
+    <div class="clearfloat"></div>
+
     <div class="box getit">
         <h1>Get it</h1>
         <ul>