From 32b5b10046f2785ee7eb66d170d56117ff91a902 Mon Sep 17 00:00:00 2001
From: DrMaxNix <contact@drmaxnix.de>
Date: Wed, 5 Oct 2022 19:46:47 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=B1=20mobile:=20scroll=20page,=20not?=
 =?UTF-8?q?=20container?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dev/index.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev/index.css b/dev/index.css
index 787f778..3a0843b 100644
--- a/dev/index.css
+++ b/dev/index.css
@@ -62,11 +62,7 @@ div.collection div.item {
 
 @media only screen and (max-width: 1200px) {
 	html, body {
-<<<<<<< HEAD
 		overflow-y: visible;
-=======
-		overflow-y: auto;
->>>>>>> 13538872284d3be1ebbdc6cc70a8155d78ac3b03
 	}
 	#console {
 		overflow-y: visible;