rb@78: <<<<<<< local
hr@17: 
pkoppatz@65: <div class="navbar navbar-default navbar-default-bottom" style="background-color:#fff;">
pkoppatz@65: 
rb@78: =======
hr@17: <div id="footer">
rb@78: >>>>>>> other
info@59:   <div class="container">
rb@78: <<<<<<< local
pkoppatz@65:    <div style="background-color:#fff;"> 
pkoppatz@65:     <div class="separator">
pkoppatz@65:       <img src="/static/images/python-logo.png" alt="python-logo" />
pkoppatz@65:     </div>
pkoppatz@65:     
peter@44:     <h3>Sponsoren/Unterstützer</h3>
pkoppatz@65:     <p>
rb@69:       <a href="http://www.sudile.com"><img src="/static/images/sponsors/sudile.jpg" alt="http://www.sudile.com" /></a>
rb@69:       <a href="http://www.blender.org"><img src="/static/images/sponsors/blender.png" alt="http://www.blender.org" /></a>
rb@69:       <a href="http://www.trabucchi.de/"><img src="/static/images/sponsors/trabucchi.png" alt="http://www.trabucchi.de/" /></a>
rb@69:       <a href="http://www.linux-systemhaus.de/"><img src="/static/images/sponsors/linux_systemhaus_schulz.png" alt="http://www.linux-systemhaus.de/" /></a>
rb@76:       <a href="http://www.evenios.com/"><img src="/static/images/sponsors/evenios.png" alt="http://www.evenios.com/">
rb@69:       <a href="http://www.pysv.org"><img src="/static/images/sponsors/pysv.png" alt="http://www.pysv.org" /></a>
rb@68: 
pkoppatz@65:     </p>  
pkoppatz@65:     <p>
rb@69:       <a href="http://www.oreilly.com/"><img src="/static/images/sponsors/sponsor-oreilly.png" alt="http://www.oreilly.com/" /></a>
rb@69:       <a href="http://galileo-press.de"> <img src="/static/images/sponsors/sponsor-galileo_press-anim.gif" alt="http://galileo-press.de" /> </a>
rb@69:       <a href="http://www.medialinx-gruppe.de/"><img src="/static/images/sponsors/sponsor-medialinx_ag.png" alt="http://www.medialinx-gruppe.de/" /></a>
pkoppatz@65:     </p> 
pkoppatz@65: </div>
pkoppatz@65: </div>
pkoppatz@65: </div>
hr@17: 
rb@78: =======
hr@17:     <img src="/static/images/python-logo.png" alt="python-logo" />
info@59:     <h3>Places for Sponsors</h3>
hr@17:   </div>
rb@78: </div>>>>>>>> other