chore: resolve merge conflict in bootstrap.ts

Browse Source

Keep settings window parent logic for Windows during merge with remote.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

...

This commit is contained in:

Xu Liang

2026-05-02 14:44:23 +08:00

parent 0b9ca39c9f cd5f038108

commit 3ee87fd91e

288 changed files with 45407 additions and 38074 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

apps/desktop-client/src/main/bootstrap.ts

+448 -415

File diff suppressed because it is too large Load Diff