Skip to content

Commit f677e2a

Browse files
mockdeepclaude
andcommitted
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

File tree

app/javascript/application.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// @ts-nocheck
22
import "@hotwired/turbo-rails";
33
import "@rails/activestorage";
4-
<<<<<<< HEAD
54
import * as bootstrap from "bootstrap";
65

76
window.bootstrap = bootstrap;
@@ -342,10 +341,3 @@ window.StoryList = StoryList;
342341
window.AppView = AppView;
343342

344343
export { Story, StoryView, StoryList, AppView };
345-
=======
346-
import {session} from "@hotwired/turbo";
347-
348-
import "./controllers/index";
349-
350-
session.drive = false;
351-
>>>>>>> 70fbdce (Update typescript to version 6.0.2 (#1384))

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)