1.1 --- a/templates/footer.html	Wed Jan 08 19:38:49 2014 +0100
     1.2 +++ b/templates/footer.html	Fri Jan 17 11:59:43 2014 +0100
     1.3 @@ -1,7 +1,12 @@
     1.4 +<<<<<<< local
     1.5  
     1.6  <div class="navbar navbar-default navbar-default-bottom" style="background-color:#fff;">
     1.7  
     1.8 +=======
     1.9 +<div id="footer">
    1.10 +>>>>>>> other
    1.11    <div class="container">
    1.12 +<<<<<<< local
    1.13     <div style="background-color:#fff;"> 
    1.14      <div class="separator">
    1.15        <img src="/static/images/python-logo.png" alt="python-logo" />
    1.16 @@ -26,3 +31,8 @@
    1.17  </div>
    1.18  </div>
    1.19  
    1.20 +=======
    1.21 +    <img src="/static/images/python-logo.png" alt="python-logo" />
    1.22 +    <h3>Places for Sponsors</h3>
    1.23 +  </div>
    1.24 +</div>>>>>>>> other