From 807540b512869ef2e2247b402ae76ce15686edc9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 24 Apr 2025 09:23:20 +0200
Subject: [PATCH] chore: refs #8224 merge dev

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index aa9a3bb44..abb9574f3 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -1140,9 +1140,7 @@ const handleSelectedAll = (data) => {
             </template>
         </FormModelPopup>
     </QDialog>
-    <<<<<<< HEAD
     <VnContextMenu ref="contextMenuRef" v-model="arrayData" />
-    ======= >>>>>>> 172b2d157479ccc10c9163961b89d89a6a675e42
     <VnScroll
         ref="vnScrollRef"
         v-if="isTableMode"