resolve conflicts in worker routes

src/router/modules/worker.js

@@ -19,7 +19,7 @@ export default {
             'WorkerNotificationsManager',
             'WorkerPBX',
             'WorkerLog',
-            'WorkerCalendar'
+            'WorkerCalendar',
         ],
         departmentCard: ['BasicData'],
     },
@@ -120,22 +120,8 @@ export default {
                         import('src/pages/Worker/Card/WorkerNotificationsManager.vue'),
                 },
                 {
-<<<<<<< HEAD
-                    name: 'WorkerCalendar',
-                    path: 'calendar',
-                    meta: {
-                        title: 'calendar',
-                        icon: 'calendar_today',
-                    },
-                    component: () => import('src/pages/Worker/Card/WorkerCalendar.vue'),
-                },
-                {
-                    name: 'WorkerPda',
-                    path: 'pda',
-=======
                     path: 'pbx',
                     name: 'WorkerPBX',
->>>>>>> be9dd8b2b721a19295af30ff538e636ef69e890a
                     meta: {
                         title: 'pbx',
                         icon: 'vn:pbx',
@@ -151,6 +137,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
                 },
+                {
+                    name: 'WorkerCalendar',
+                    path: 'calendar',
+                    meta: {
+                        title: 'calendar',
+                        icon: 'calendar_today',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerCalendar.vue'),
+                },
             ],
         },
     ],