wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

feat: refs #8224 conflicts

This commit is contained in:
William Buezas 2024-12-02 10:49:59 -03:00
parent df8cd3dd55
commit 2498c8e365
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pages/Ticket/TicketList.vue
View File

@ -620,12 +620,9 @@ function setReference(data) {
'row-key': 'id', 'row-key': 'id',
selection: 'multiple', selection: 'multiple',
}" }"
<<<<<<< Updated upstream
data-cy="ticketListTable" data-cy="ticketListTable"
=======
:context-menu-items="contextMenuItems" :context-menu-items="contextMenuItems"
:expr-builder="exprBuilder" :expr-builder="exprBuilder"
>>>>>>> Stashed changes
> >
<template #column-statusIcons="{ row }"> <template #column-statusIcons="{ row }">
<TicketProblems :row="row" /> <TicketProblems :row="row" />