From 746f0d7cd16c788fb598514a341b98d054109dc3 Mon Sep 17 00:00:00 2001
From: noxy <git@f0ck.it>
Date: Sun, 29 Aug 2021 04:12:31 +0000
Subject: [PATCH] Update custom.css

---
 custom.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/custom.css b/custom.css
index 4a250a5..72fd0a0 100644
--- a/custom.css
+++ b/custom.css
@@ -344,5 +344,3 @@ span.mx_MVideoBody video.mx_MVideoBody {
   box-shadow: unset;
   border-radius: 0;
 }
-=======
->>>>>>> 26529aa77a2fdc33f832f6903982bb6f048c8d18