diff options
| author | nice | 2014-08-27 16:43:14 +0530 |
|---|---|---|
| committer | nice | 2014-08-27 16:43:14 +0530 |
| commit | 324154d510a97e00f4e15bc68af595f13484f16e (patch) | |
| tree | e0d0a7a9fbcf0335367b2987ff38b8bba72360e2 /static/website/templates/page.html | |
| parent | 6930246145a5df0d9e7864ea0ded7180a0329437 (diff) | |
| parent | 65954e0afb8a51122241296c083a565d83e984dc (diff) | |
| download | pyfoss-324154d510a97e00f4e15bc68af595f13484f16e.tar.gz pyfoss-324154d510a97e00f4e15bc68af595f13484f16e.tar.bz2 pyfoss-324154d510a97e00f4e15bc68af595f13484f16e.zip | |
resolving conflict
Diffstat (limited to 'static/website/templates/page.html')
| -rw-r--r-- | static/website/templates/page.html | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/static/website/templates/page.html b/static/website/templates/page.html index a87a81e..d91566f 100644 --- a/static/website/templates/page.html +++ b/static/website/templates/page.html @@ -26,8 +26,15 @@ <div id="header-wrapper"> <div id="header-inner"> <div id="branding" class="pull-left"> +<<<<<<< HEAD <img id="brand-logo" src="{% static 'website/images/pylogo.png' %}"> <a id="brand-text" href="{% url 'website:home' %}">Python</a> +======= + <a href="http://python.fossee.in" style="text-decoration: none; color: #424242"> + <img id="brand-logo" src="{% static 'images/pylogo.png' %}"> + <span id="brand-text">Python</span> + </a> +>>>>>>> 65954e0afb8a51122241296c083a565d83e984dc </div> <ul id="main-nav" class="nav nav-pills pull-right"> @@ -150,6 +157,12 @@ <img id="django-logo" src="{% static 'website/images/django-logo.png' %}"> </div> <!-- /footer-inner --> </div> <!-- /footer-wrapper --> + <center> + Sponsored by:<br> + National Mission on Education through ICT<br> + MHRD<br> + <a href="http://www.sakshat.ac.in" target="_blank">http://www.sakshat.ac.in</a> + </center> {% endblock %} {% endblock %} </div> <!-- /page-wrapper --> |