Gulum/GerbilManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEAT-13: resolve leftover rebase conflict markers in App.tsx routes (hilfe + vertraege/einstellungen union)

Browse Source 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Gulum
2026-06-06 07:58:01 +02:00
parent be62e785db
commit d3f38b9be4
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerbil-manager-web/src/App.tsx
View File

@@ -58,16 +58,13 @@ export default function App() {
<Route path="genetik" element={<GenetikPage />} /> <Route path="genetik" element={<GenetikPage />} />
<Route path="abgabe" element={<AbgabePage />} /> <Route path="abgabe" element={<AbgabePage />} />
<Route path="statistik" element={<StatistikPage />} /> <Route path="statistik" element={<StatistikPage />} />
<<<<<<< HEAD
<Route path="hilfe" element={<HilfePage />} /> <Route path="hilfe" element={<HilfePage />} />
=======
{/* FEAT-13: Abgabeverträge + Einstellungen (Zuchtprofil) */} {/* FEAT-13: Abgabeverträge + Einstellungen (Zuchtprofil) */}
<Route path="vertraege"> <Route path="vertraege">
<Route index element={<VertraegeListPage />} /> <Route index element={<VertraegeListPage />} />
<Route path="neu" element={<VertragWizardPage />} /> <Route path="neu" element={<VertragWizardPage />} />
</Route> </Route>
<Route path="einstellungen" element={<EinstellungenPage />} /> <Route path="einstellungen" element={<EinstellungenPage />} />
>>>>>>> 3ec4f66 (FEAT-13: Abgabe wizard (/vertraege/neu, 4 steps, ?tiere= prefill), Vertraege list w/ download+delete, /einstellungen Zuchtprofil form, contracts/settings API clients, nav entries, detail-page entry point + replace orphaned contactInfo with email/phone/address across Kontakt pages)
<Route path="*" element={<NotFoundPage />} /> <Route path="*" element={<NotFoundPage />} />
</Route> </Route>
</Routes> </Routes>