From 25cc716bd7c5968aa11d6c9aaef6e0cd724b86ad Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期五, 01 九月 2023 11:56:00 +0800
Subject: [PATCH] 冲突

---
 screen_standard/src/assets/main.css |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen_standard/src/assets/main.css b/screen_standard/src/assets/main.css
index ead72f7..5df6d48 100644
--- a/screen_standard/src/assets/main.css
+++ b/screen_standard/src/assets/main.css
@@ -10,7 +10,7 @@
   margin: 0;
   /* height: 100%; */
   height: 100vh;
-  /* overflow-y: scroll; */
+  overflow-y: hidden;
   font-weight: normal;
 
 }

--
Gitblit v1.9.3