commit
8641806a6b
@ -1,6 +1,13 @@
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=2eae82d3fa71f897e604",
|
||||
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=e0ff24444a4741972c82",
|
||||
"/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=40d15556cfb075cca358",
|
||||
"/js/vue/User/app.js": "/js/vue/User/app.js?id=47c003e1714e1da1fa59"
|
||||
=======
|
||||
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=126dc6f3c173336b3c08",
|
||||
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=bf18112bfd001430c068",
|
||||
"/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=59b1f7ca2c06f4958f2e",
|
||||
"/js/vue/User/app.js": "/js/vue/User/app.js?id=5ec6720cc9a709374d5e"
|
||||
>>>>>>> c0f6a79f244f309e9e6390d4550862645db4a1e0
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
export default [
|
||||
{
|
||||
path: '/CRM/MyTasks',
|
||||
name: 'MyTasks',
|
||||
view: 'Common/views/Tasks'
|
||||
}
|
||||
// {
|
||||
// path: '/CRM/MyTasks',
|
||||
// name: 'MyTasks',
|
||||
// view: 'Common/views/Tasks'
|
||||
// }
|
||||
];
|
||||
|
Loading…
Reference in new issue