no message

src/modules/05_placement/router.ts

@@ -33,24 +33,8 @@ const probationFormEvaluation = () =>
 
 const probationWorkAdd = () =>
   import("@/modules/05_placement/components/probation/MainDetail.vue");
-<<<<<<< HEAD
-  const probationWorkAdd2 = () =>
-  import("@/modules/05_placement/components/probation/AddWork.vue");
-
-export default [
-  {
-    path: "/placement",
-    name: "placement",
-    component: PlacementMain,
-    meta: {
-      Auth: true,
-      Key: [6.1],
-      Role: "placement",
-=======
   const probationFormAssign = () =>
     import("@/modules/05_placement/components/probation/FormAssign.vue");
-  const resignOrder = () =>
-    import("@/modules/05_placement/components/OrderPlacement/ResignOrder.vue");
   export default [
     {
       path: "/placement",
@@ -61,7 +45,6 @@ export default [
         Key: [6.1],
         Role: "placement",
       },
->>>>>>> develop
     },
     {
       path: "/placement/personal-list/:examId",
@@ -173,20 +156,4 @@ export default [
         Role: "placement",
       },
     },
-<<<<<<< HEAD
-  },  
-
-];
-=======
-    {
-      path: "/placement/resign-order",
-      name: "ResignOrderplacement",
-      component: resignOrder,
-      meta: {
-        Auth: true,
-        Key: [6.2],
-        Role: "placement",
-      },
-    },
   ];
->>>>>>> develop