Skip to content

Commit ed0ec7d

Browse files
aramb-devclaude
andcommitted
merge: resolve package.json conflict keeping newer dep versions
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2 parents d8c5524 + a97cfc8 commit ed0ec7d

3 files changed

Lines changed: 1118 additions & 2128 deletions

File tree

package-lock.json

Lines changed: 47 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)