merge main

1 year ago · 2041650cca
parent a0873a956f
commit 2041650cca
1 changed files with 0 additions and 5 deletions
--- 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";