feat: resolved merge issues

This commit is contained in:
=
2025-07-02 01:16:52 +05:30
parent b47846a780
commit bf8d60fcdc
6 changed files with 54 additions and 87 deletions
+1 -3
View File
@@ -388,9 +388,7 @@ export const routes = rootRoute("root.tsx", [
layout("org-layout", "organization/layout.tsx", [
organizationRoutes,
route("/secret-manager/$projectId", [
layout("project-layout-fallback-approval", "project/layout.tsx", [
route("/approval", "secret-manager/redirects/redirect-approval-page.tsx")
])
route("/approval", "secret-manager/redirects/redirect-approval-page.tsx")
]),
route("/projects/$projectId", [
layout("project-layout", "project/layout.tsx", [