mirror of
https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend
synced 2025-12-28 22:42:11 +01:00
8d063428fc
Resolved conflicts: - .gitignore: Added .claude to ignored files - nx.json: Kept HEAD version with extra eslint.config.js exclusion - package.json: Merged dependencies, updated vitest to v3.1.1 for compatibility - eslint config files: Fixed merge conflicts and accepted conversion from .mjs to .js - Removed deleted files from refactor branch - Regenerated package-lock.json with --legacy-peer-deps Build and tests pass successfully.