From 2041650ccad4fc35cd80de011ff90d8a41622c7e Mon Sep 17 00:00:00 2001 From: StyleZhang Date: Tue, 26 Nov 2024 10:29:58 +0800 Subject: [PATCH] merge main --- web/app/styles/globals.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web/app/styles/globals.css b/web/app/styles/globals.css index c76f8f51e9..8df48cc9e7 100644 --- a/web/app/styles/globals.css +++ b/web/app/styles/globals.css @@ -2,13 +2,8 @@ @tailwind base; @tailwind components; -<<<<<<< HEAD -@import "../../themes/light.css"; -@import "../../themes/dark.css"; -======= @import '../../themes/light.css'; @import '../../themes/dark.css'; ->>>>>>> main @import "../../themes/manual-light.css"; @import "../../themes/manual-dark.css";