From af75a6d0da5ec8fc86d34bba29d21b55e5b411f0 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 19 十二月 2023 09:06:27 +0800
Subject: [PATCH] 解决冲突
---
src/assets/main.css | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/assets/main.css b/src/assets/main.css
index 3c7c762..f760b68 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -1,4 +1,5 @@
@import './base.css';
+@import './button.css';
#app {
/* background-color: rgb(212, 41, 41); */
--
Gitblit v1.9.3