fix: merge in dev

2024-09-24 08:15:44 +02:00 · 2024-09-24 08:15:44 +02:00 · 8760781660
parent 98a3b03be7
commit 8760781660
1 changed files with 2 additions and 2 deletions
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -789,11 +789,11 @@ es:
    thead tr:first-child th {
        top: 0;
    }
-    <<<<<<< HEAD .q-table__top {
+    .q-table__top {
        top: 0;
        padding: 12px 0;
    }
-    =======>>>>>>>d13cab0a240a3a10db97a793022ba0f5ded48965 tbody {
+    tbody {
        .q-checkbox {
            display: flex;
            margin-bottom: 9px;