PowerOn/frontend_nyla
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix:merge conflicts

Browse source
This commit is contained in:
Ida Dittrich 2026-02-13 10:31:55 +01:00
commit 48d3cfcd3e
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/App.tsx
View file

@ -1,14 +1,8 @@
/** /**
* App.tsx * App.tsx
<<<<<<< HEAD
*
* Haupt-App-Komponente mit Multi-Tenant Router-Setup.
*
=======
* *
* Haupt-App-Komponente mit Multi-Tenant Router-Setup. * Haupt-App-Komponente mit Multi-Tenant Router-Setup.
* *
>>>>>>> 845094a (feat(realestate): PEK map and address UI, realestate views, feature-instance routes)
* URL-Struktur: * URL-Struktur:
* - / → Dashboard/Übersicht * - / → Dashboard/Übersicht
* - /settings → Benutzer-Einstellungen * - /settings → Benutzer-Einstellungen
@ -36,8 +30,6 @@ import { ProtectedRoute } from './providers/auth/ProtectedRoute';
import { LanguageProvider } from './providers/language/LanguageContext'; import { LanguageProvider } from './providers/language/LanguageContext';
import { ToastProvider } from './contexts/ToastContext'; import { ToastProvider } from './contexts/ToastContext';
import { WorkflowSelectionProvider } from './contexts/WorkflowSelectionContext'; import { WorkflowSelectionProvider } from './contexts/WorkflowSelectionContext';
import { FileProvider } from './contexts/FileContext';
import { MainLayout } from './layouts/MainLayout'; import { MainLayout } from './layouts/MainLayout';
import { FeatureLayout } from './layouts/FeatureLayout'; import { FeatureLayout } from './layouts/FeatureLayout';
import { DashboardPage } from './pages/Dashboard'; import { DashboardPage } from './pages/Dashboard';