fix(frontend): resolve merge conflict in usage-monitor.ts

Browse Source

The merge from develop brought in changes to usage-monitor.ts that
were not properly merged. The file had 405 lines instead of 1229 lines.

This commit properly resolves the merge by taking the complete file
from the develop branch (3b87e24d).

Signed-off-by: StillKnotKnown <[email protected]>

...

This commit is contained in:

StillKnotKnown

2026-01-22 11:46:52 +02:00

parent 10fdc32617

commit ff7d3539f8

1 changed files with 990 additions and 165 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/frontend/src/main/claude-profile/usage-monitor.ts

+990 -165

File diff suppressed because it is too large Load Diff