Conflicts:

templates/includes/js-m.html templates/includes/js-o.html templates/layout/layout.html

Conflicts:
templates/includes/js-m.html templates/includes/js-o.html templates/layout/layout.html
12b4d15f · Manggar Mahardhika · 4307a24b · c97259c9 · 12b4d15f · 12b4d15f
Commit 12b4d15f authored Dec 22, 2021 by Manggar Mahardhika
8 changed files
--- a/static/js/scripts_js_m.js
+++ b/static/js/scripts_js_m.js
--- a/static/js/scripts_js_o.js
+++ b/static/js/scripts_js_o.js
--- a/static/js/scripts_layout.js
+++ b/static/js/scripts_layout.js
--- a/static/js/scripts_sidebar.js
+++ b/static/js/scripts_sidebar.js
--- a/templates/includes/js-m.html
+++ b/templates/includes/js-m.html
@@ -88,7 +88,6 @@
        display: block;
    }
 </style>
-{% endif %}{% endfor %}

 <script>
    //suk
@@ -9603,3 +9602,4 @@
        });
    };
 </script>
+{% endif %}{% endfor %}
--- a/templates/includes/m.html
+++ b/templates/includes/m.html
--- a/templates/includes/sidebar.html
+++ b/templates/includes/sidebar.html
--- a/templates/layout/layout.html
+++ b/templates/layout/layout.html