merge: resolve conflict with main, combine lodash and vite overrides

Browse Source

Co-Authored-By: Paperclip <noreply@paperclip.ing>

...

This commit is contained in:

Chris Farhood

2026-05-03 23:17:53 +00:00

committed by Gandalf the Greybeard [agent]

parent a7daabe4a0 8e9b2c2645

commit 1d65d5137a

2 changed files with 925 additions and 841 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

pnpm-lock.yaml

Generated

+923 -840

File diff suppressed because it is too large Load Diff