From 9aaec391b241a3c214ffe29d928b356abef10fdf Mon Sep 17 00:00:00 2001
From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com>
Date: Fri, 26 Jan 2024 00:33:31 +1000
Subject: [PATCH] well
---
templates/base.html | 4 ----
1 file changed, 4 deletions(-)
diff --git a/templates/base.html b/templates/base.html
index df6193a..27dd1a2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -4,9 +4,6 @@
-<<<<<<< HEAD
-
-=======
@@ -17,7 +14,6 @@
->>>>>>> dev
{% assets 'css' %}
{% endassets %}