chore: fixed merge conflicts

2025-12-08 14:54:14 +05:30
parent eab43a66cf 61215cf0ad
commit 552b5845ea
110 changed files with 26439 additions and 11302 deletions
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -248,6 +248,23 @@ const routes = [
 		name: 'Search',
 		component: () => import('@/pages/Search/Search.vue'),
 	},
+	{
+		path: '/data-import',
+		name: 'DataImportList',
+		component: () => import('@/pages/DataImport.vue'),
+	},
+	{
+		path: '/data-import/doctype/:doctype',
+		name: 'NewDataImport',
+		component: () => import('@/pages/DataImport.vue'),
+		props: true,
+	},
+	{
+		path: '/data-import/:importName',
+		name: 'DataImport',
+		component: () => import('@/pages/DataImport.vue'),
+		props: true,
+	},
 ]

 let router = createRouter({