<<<<<<< local

 <div class="navbar navbar-default navbar-default-bottom" style="background-color:#fff;">

 =======

 <div id="footer">

 >>>>>>> other

   <div class="container">

 <<<<<<< local

    <div style="background-color:#fff;"> 

     <div class="separator">

       <img src="/static/images/python-logo.png" alt="python-logo" />

     </div>

     <h3>Sponsoren/Unterstützer</h3>

     <p>

       <a href="http://www.sudile.com"><img src="/static/images/sponsors/sudile.jpg" alt="http://www.sudile.com" /></a>

       <a href="http://www.blender.org"><img src="/static/images/sponsors/blender.png" alt="http://www.blender.org" /></a>

       <a href="http://www.trabucchi.de/"><img src="/static/images/sponsors/trabucchi.png" alt="http://www.trabucchi.de/" /></a>

       <a href="http://www.linux-systemhaus.de/"><img src="/static/images/sponsors/linux_systemhaus_schulz.png" alt="http://www.linux-systemhaus.de/" /></a>

       <a href="http://www.evenios.com/"><img src="/static/images/sponsors/evenios.png" alt="http://www.evenios.com/">

       <a href="http://www.pysv.org"><img src="/static/images/sponsors/pysv.png" alt="http://www.pysv.org" /></a>

     </p>  

     <p>

       <a href="http://www.oreilly.com/"><img src="/static/images/sponsors/sponsor-oreilly.png" alt="http://www.oreilly.com/" /></a>

       <a href="http://galileo-press.de"> <img src="/static/images/sponsors/sponsor-galileo_press-anim.gif" alt="http://galileo-press.de" /> </a>

       <a href="http://www.medialinx-gruppe.de/"><img src="/static/images/sponsors/sponsor-medialinx_ag.png" alt="http://www.medialinx-gruppe.de/" /></a>

     </p> 

 </div>

 </div>

 </div>

 =======

     <img src="/static/images/python-logo.png" alt="python-logo" />

     <h3>Places for Sponsors</h3>

   </div>

 </div>>>>>>>> other