From 81801628a5d9e0e21e02689ca8f7715250ca6909 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sat, 5 Feb 2022 23:16:13 +0000
Subject: [PATCH] df

---
 files/templates/sidebar_2Much4You.html | 57 +++++++++++++-------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/files/templates/sidebar_2Much4You.html b/files/templates/sidebar_2Much4You.html
index bb5ee21f14..69b0b1e50b 100644
--- a/files/templates/sidebar_2Much4You.html
+++ b/files/templates/sidebar_2Much4You.html
@@ -1,29 +1,28 @@
-<<<<<<< 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=1008' %}
-    {% else %}
-        {% set image='/static/assets/images/2Much4You/sidebar.webp?a=1009' %}
-    {% endif %}
-
-    <img role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{image}}')" loading="lazy" src="{{image}}" width=100%>
-
-
-{% if sub %}
-    <div class="mt-4">{{sub.sidebar_html|safe}}</div>
-    <a class="btn btn-primary btn-block mt-4" href="/s/{{sub.name}}/mods">MODS</a>
-    {% if v and v.mods(sub.name) %}
-        <a class="btn btn-primary btn-block" href="/s/{{sub.name}}/sidebar">EDIT SIDEBAR</a>
-    {% endif %}
-{% else %}
-    <p class="mt-4">Rules: No doxxing, No CP or other clearly illegal shit. Thanks!</p>
-{% endif %}
-
-<pre>
-
-
-
-
-    
-</pre>
-</div>
+<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' %}
+    {% else %}
+        {% set image='/static/assets/images/2Much4You/sidebar.webp?a=1039' %}
+    {% endif %}
+
+    <img role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{image}}')" loading="lazy" src="{{image}}" width=100%>
+
+
+{% if sub %}
+    <div class="mt-4">{{sub.sidebar_html|safe}}</div>
+    <a class="btn btn-primary btn-block mt-4" href="/s/{{sub.name}}/mods">MODS</a>
+    {% if v and v.mods(sub.name) %}
+        <a class="btn btn-primary btn-block" href="/s/{{sub.name}}/sidebar">EDIT SIDEBAR</a>
+    {% endif %}
+{% else %}
+    <p class="mt-4">Rules: No doxxing, No CP or other clearly illegal shit. Thanks!</p>
+{% endif %}
+
+<pre>
+
+
+
+
+    
+</pre>
+</div>
\ No newline at end of file