equal
deleted
inserted
replaced
|
1 <<<<<<< local |
1 |
2 |
2 <div class="navbar navbar-default navbar-default-bottom" style="background-color:#fff;"> |
3 <div class="navbar navbar-default navbar-default-bottom" style="background-color:#fff;"> |
3 |
4 |
|
5 ======= |
|
6 <div id="footer"> |
|
7 >>>>>>> other |
4 <div class="container"> |
8 <div class="container"> |
|
9 <<<<<<< local |
5 <div style="background-color:#fff;"> |
10 <div style="background-color:#fff;"> |
6 <div class="separator"> |
11 <div class="separator"> |
7 <img src="/static/images/python-logo.png" alt="python-logo" /> |
12 <img src="/static/images/python-logo.png" alt="python-logo" /> |
8 </div> |
13 </div> |
9 |
14 |
24 </p> |
29 </p> |
25 </div> |
30 </div> |
26 </div> |
31 </div> |
27 </div> |
32 </div> |
28 |
33 |
|
34 ======= |
|
35 <img src="/static/images/python-logo.png" alt="python-logo" /> |
|
36 <h3>Places for Sponsors</h3> |
|
37 </div> |
|
38 </div>>>>>>>> other |