From 47cb49a8532fa8fde83286e9ea43d0a9ed1a5114 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期四, 13 六月 2024 17:20:21 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/artAndDrama/assets/main.less | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/books/artAndDrama/assets/main.less b/src/books/artAndDrama/assets/main.less
index 862de56..17fb90d 100644
--- a/src/books/artAndDrama/assets/main.less
+++ b/src/books/artAndDrama/assets/main.less
@@ -510,7 +510,6 @@
outline: none;
}
}
-<<<<<<< HEAD
.page-footer {
position: relative;
display: flex;
@@ -593,11 +592,6 @@
}
/* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
@media (max-width: 430px) {
-=======
-}
- /* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
- @media (max-width: 430px) {
->>>>>>> ba76798a669c6d859d0f8b9a913e7637d3e8d7e2
.ans-drama {
.page-box {
min-height: 750px;
--
Gitblit v1.9.1