dww

front/src/router/index.js

@@ -46,12 +46,13 @@ const routes = [
     name: 'extraordinario',
     component: () => import('../components/WebPageSections/navbarcontent/Extraordinario.vue')
   },
-    {
+  {
     path: '/modalidades/general',
     name: 'general',
     component: () => import('../components/WebPageSections/navbarcontent/General.vue')
   },
 
+<<<<<<< Updated upstream
   //     {
   //   path: '/programas/ingenierias',
   //   name: 'ingenierias',
@@ -64,6 +65,18 @@ const routes = [
   // },
 
 
+=======
+  {
+    path: '/programas/ingenierias',
+    name: 'ingenierias',
+    component: () => import('../components/WebPageSections/perfiles/ing/CarrerasIng.vue')
+  },
+    {
+    path: '/programas/ingenierias/:id',
+    name: 'ingenierias-detalle',
+    component: () => import('../components/WebPageSections/perfiles/ing/Detalles.vue')
+  },
+>>>>>>> Stashed changes
 
   {
     path: '/portal-postulante',