From 75e8fb06b42420f21c8571341ef8300a102cd2c7 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Thu, 2 Jan 2020 16:18:59 +0530 Subject: Resolve conflicts --- yaksh/templates/base.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'yaksh/templates/base.html') 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 @@ {% block script %} {% endblock %} - @@ -58,7 +57,7 @@ {% block nav %} {% endblock %} -

-- cgit

{% block pagetitle %}{% endblock pagetitle %}