From 2498c8e365f16062560bbf948c33d20ce43c523e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 2 Dec 2024 10:49:59 -0300
Subject: [PATCH] feat: refs #8224 conflicts

---
 src/pages/Ticket/TicketList.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 6df8f5c0e..bc1b2d0c1 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -620,12 +620,9 @@ function setReference(data) {
             'row-key': 'id',
             selection: 'multiple',
         }"
-<<<<<<< Updated upstream
         data-cy="ticketListTable"
-=======
         :context-menu-items="contextMenuItems"
         :expr-builder="exprBuilder"
->>>>>>> Stashed changes
     >
         <template #column-statusIcons="{ row }">
             <TicketProblems :row="row" />