dfs

2022-02-06 01:16:03 +02:00 · 2022-02-06 01:16:03 +02:00 · b29012fdce
commit b29012fdce
parent 15c4952265
1 changed files with 1 additions and 2 deletions
--- a/files/templates/sidebar_2Much4You.html
+++ b/files/templates/sidebar_2Much4You.html
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
    {% if sub %}
        {% set image='/static/assets/images/subs/' + sub.name + '.webp?a=1009' %}