From 876078166081102fc0cfba3cd76601aee361a153 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 08:15:44 +0200
Subject: [PATCH] fix: merge in dev

---
 src/components/VnTable/VnTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a6948494c21..a7c4e637804 100644
--- 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;