defuj/apkt-eis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
kur0nek-o 2023-10-27 11:08:47 +07:00
parent 53e05e9891
commit dfcd95ba8a
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/assets/css/style.css
View File

@ -1889,13 +1889,8 @@ select {
--tw-bg-opacity: 0.8; --tw-bg-opacity: 0.8;
} }
<<<<<<< HEAD
.bg-none {
background-image: none;
=======
.bg-opacity-100 { .bg-opacity-100 {
--tw-bg-opacity: 1; --tw-bg-opacity: 1;
>>>>>>> 28382959d66e99e037740e0f946d7fa2ff14e3f5
} }
.fill-gray-500 { .fill-gray-500 {