fix conflict

2023-10-27 11:08:47 +07:00 · 2023-10-27 11:08:47 +07:00 · dfcd95ba8a
commit dfcd95ba8a
parent 53e05e9891
1 changed files with 0 additions and 5 deletions
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@ -1889,13 +1889,8 @@ select {
  --tw-bg-opacity: 0.8;
 }

-<<<<<<< HEAD
-.bg-none {
-  background-image: none;
-=======
 .bg-opacity-100 {
  --tw-bg-opacity: 1;
->>>>>>> 28382959d66e99e037740e0f946d7fa2ff14e3f5
 }

 .fill-gray-500 {