merge: resolve conflicts keeping feature/bechmarks changes

This commit is contained in:
Kazuma
2026-06-12 00:30:16 -04:00
153 changed files with 14417 additions and 761 deletions
Executable → Regular
+1 -10
View File
@@ -1,11 +1,2 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
# Format all staged files with Prettier
npm run format
# Lint and fix staged files
# Lint and auto-fix staged files only (fast)
npx lint-staged
# Run tests
npm test
Executable → Regular
+1
View File
@@ -1 +1,2 @@
# Run full test suite before push
npm test