From 7dea29e735a6fe5724bf7ffe05556d19fe7f7be7 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 6 Feb 2022 01:16:03 +0200
Subject: [PATCH] dfs

---
 files/templates/sidebar_2Much4You.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/files/templates/sidebar_2Much4You.html b/files/templates/sidebar_2Much4You.html
index e412bd996..c51f05bae 100644
--- 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' %}
@@ -26,4 +25,4 @@
 
     
 </pre>
-</div>
+</div>
\ No newline at end of file