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

fix: refs #4466 conficts

This commit is contained in:
Jorge Penadés 2024-02-02 14:07:33 +01:00
parent 3d6f9f9dd2
commit 814c8dc0e2
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/router/modules/invoiceIn.js
View File

@ -114,7 +114,15 @@ export default {
import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
},
{
<<<<<<< HEAD
name: 'InvoiceInLog',
path: 'log',
meta: {
title: 'log',
icon: 'history',
},
component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
},
{
name: 'InvoiceInCorrective',
path: 'corrective',
meta: {
@ -123,15 +131,6 @@ export default {
},
component: () =>
import('src/pages/InvoiceIn/Card/InvoiceInCorrective.vue'),
=======
name: 'InvoiceInLog',
path: 'log',
meta: {
title: 'log',
icon: 'history',
},
component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
>>>>>>> 013a00d653a4f2d2c766d8460d56fe62403fe3df
},
],
},