summaryrefslogtreecommitdiff
path: root/yaksh/templates/base.html
diff options
context:
space:
mode:
authorCruiseDevice2020-01-02 16:18:59 +0530
committerCruiseDevice2020-01-02 16:18:59 +0530
commit75e8fb06b42420f21c8571341ef8300a102cd2c7 (patch)
tree37ac9aeae29a06fad73a596580ad9ce0970fcd6c /yaksh/templates/base.html
parenteb05d4b0bc3fd0e2ce5160f30251bd9b939ccef6 (diff)
downloadonline_test-75e8fb06b42420f21c8571341ef8300a102cd2c7.tar.gz
online_test-75e8fb06b42420f21c8571341ef8300a102cd2c7.tar.bz2
online_test-75e8fb06b42420f21c8571341ef8300a102cd2c7.zip
Resolve conflicts
Diffstat (limited to 'yaksh/templates/base.html')
-rw-r--r--yaksh/templates/base.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index 9021e3d..0cfe8a3 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -43,7 +43,6 @@
</script>
{% block script %}
{% endblock %}
- </script>
</head>
<body {% block onload %} {% endblock %} class="yaksh">
@@ -58,7 +57,7 @@
{% block nav %}
{% endblock %}
- <div class="content">
+ <div class="base-content">
<div class="header">
<h3><center>{% block pagetitle %}{% endblock pagetitle %}</center></h3>
</div>