Revert "chore(merge): resolve v2 conflicts"

This reverts commit 377f2f6a20, reversing
changes made to 7e4cb0201b.
This commit is contained in:
Thomas Camlong committed 2026-07-15 12:12:33 +02:00
1 parent 377f2f6a20
commit 8a7c4875bf
58 files changed
+11115 -23863

No files matched your search

-2
View File
@@ -81,5 +81,3 @@ When modifying user-facing code, you MUST also update the corresponding document
- UI: Mantine (not Tailwind) — Tailwind is only used in docs app
- Icons: @tabler/icons-react
- Docs app can import from `@homarr/definitions` for shared types
- Use `dayjs` for date/time formatting or comparisons; do not hand-roll relative time or date math.
- Extract shared helpers/components when the same logic appears in multiple workshop/store files.