From cb2e79e8374725da81b19c518405f1b91c86e601 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 07 四月 2022 14:27:54 +0800
Subject: [PATCH] Merge branch 'master' of D:\workspace\ztqt with conflicts.

---
 index.html |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/index.html b/index.html
index d8edb25..e0ff05f 100644
--- a/index.html
+++ b/index.html
@@ -22,6 +22,7 @@
         #app {
             margin: 0;
             padding: 0;
+            overflow: hidden;
             height: 100%;
         }
 

--
Gitblit v1.9.2