switched to template

2022-08-11 15:34:45 +03:00
parent 368fb13a06
commit eb1657c948
73 changed files with 2009 additions and 7058 deletions
--- a/templates/_default/base.html
+++ b/templates/_default/base.html
@@ -1,16 +1,5 @@
 <!DOCTYPE html>
 <html lang="en" charset="utf-8">
-<<<<<<< HEAD
-  {% include "partials/head.html" %}
-
-  <body>
-
-    <div id="content">
-        {% block content %}{% endblock %}
-    </div>
-
-  </body>
-=======

    {% include "partials/head.html" %}
    
@@ -21,5 +10,4 @@
        </div>
        {% include "partials/footer.html" %}
    </body>
->>>>>>> template/master
 </html>