resolved conflict during came rebase

This commit is contained in:
pramod mahajan 2025-09-17 14:19:02 +05:30
parent 8eb8e27f89
commit 78a0ecebf1

View File

@ -49,9 +49,9 @@ import MainResetPasswordPage from "../pages/authentication/MainResetPasswordPage
import TenantPage from "../pages/Tenant/TenantPage"; import TenantPage from "../pages/Tenant/TenantPage";
import { Navigate } from "react-router-dom"; import { Navigate } from "react-router-dom";
import CreateTenant from "../pages/Tenant/CreateTenant"; import CreateTenant from "../pages/Tenant/CreateTenant";
import SuperTenantDetails from "../pages/Tenant/SuperTenantDetails"; ;
import SelfTenantDetails from "../pages/Tenant/SelfTenantDetails";
import OrganizationPage from "../pages/Organization/OrganizationPage"; import OrganizationPage from "../pages/Organization/OrganizationPage";
import LandingPage from "../pages/Home/LandingPage";
const router = createBrowserRouter( const router = createBrowserRouter(
[ [
{ {