merge main

This commit is contained in:
StyleZhang 2024-11-26 10:29:58 +08:00
parent a0873a956f
commit 2041650cca

View File

@ -2,13 +2,8 @@
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;
<<<<<<< HEAD
@import "../../themes/light.css";
@import "../../themes/dark.css";
=======
@import '../../themes/light.css'; @import '../../themes/light.css';
@import '../../themes/dark.css'; @import '../../themes/dark.css';
>>>>>>> main
@import "../../themes/manual-light.css"; @import "../../themes/manual-light.css";
@import "../../themes/manual-dark.css"; @import "../../themes/manual-dark.css";