diff options
| author | prathamesh | 2018-01-02 22:09:44 +0530 |
|---|---|---|
| committer | prathamesh | 2018-01-02 22:09:44 +0530 |
| commit | 44e16651a9f7faec95a32c19738a996a731ae57a (patch) | |
| tree | 0aa8439547b0f1281ab78964aaf3f7ad176ed6da /yaksh/templates/base.html | |
| parent | e14514e01052fb36cd9f14675cbe7ca940945a34 (diff) | |
| parent | e566d54239efcb46f253e324b7295a676378f656 (diff) | |
| download | online_test-44e16651a9f7faec95a32c19738a996a731ae57a.tar.gz online_test-44e16651a9f7faec95a32c19738a996a731ae57a.tar.bz2 online_test-44e16651a9f7faec95a32c19738a996a731ae57a.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into exercise
Conflicts Resolved:
yaksh/templates/yaksh/courses.html
yaksh/templates/yaksh/question.html
Diffstat (limited to 'yaksh/templates/base.html')
| -rw-r--r-- | yaksh/templates/base.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html index e7c4a99..08c4f70 100644 --- a/yaksh/templates/base.html +++ b/yaksh/templates/base.html @@ -53,8 +53,9 @@ {% endblock %} </div> </div> + <div class="container"> <footer class="footer" id="footer_div"> - <div class="logged_user_info" align="center"> + <div class="logged_user_info" align="center" > {% block info %} {% endblock %} </div> @@ -62,6 +63,7 @@ <p align="center">Developed by FOSSEE group, IIT Bombay</p> </div> </footer> + </div> </body> </html> |