From 9a11f818f304bc13bbd920313792e9560734922f Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:31:25 +0800
Subject: [PATCH] 合并冲突
---
src/assets/base.css | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/assets/base.css b/src/assets/base.css
index ff2dd39..a14d6ab 100644
--- a/src/assets/base.css
+++ b/src/assets/base.css
@@ -67,4 +67,6 @@
body {
/* background-color: rebeccapurple; */
margin: 0;
-}
+ /* min-width: 1440px; */
+ /* min-height: 820px; */
+}
\ No newline at end of file
--
Gitblit v1.9.3