Commit f677e2a
Fix conflict markers from TypeScript 5.9.3 → 6.0.2 template update
Resolves merge conflicts in application.ts (keep project's Backbone.js
app, discard template's simplified version) and pnpm-lock.yaml (update
peer dependency keys to typescript@6.0.2, preserve vite@7.3.1).
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>1 parent dbd749d commit f677e2a
2 files changed
Lines changed: 7 additions & 46 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | 4 | | |
6 | 5 | | |
7 | 6 | | |
| |||
342 | 341 | | |
343 | 342 | | |
344 | 343 | | |
345 | | - | |
346 | | - | |
347 | | - | |
348 | | - | |
349 | | - | |
350 | | - | |
351 | | - | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments