# Conflicts: # packages/core/src/global-config.ts # packages/web/src/components/Dashboard.tsx # packages/web/src/components/SessionDetailHeader.tsx |
||
|---|---|---|
| .. | ||
| ao | ||
| cli | ||
| core | ||
| integration-tests | ||
| notifier-macos | ||
| plugins | ||
| web | ||
# Conflicts: # packages/core/src/global-config.ts # packages/web/src/components/Dashboard.tsx # packages/web/src/components/SessionDetailHeader.tsx |
||
|---|---|---|
| .. | ||
| ao | ||
| cli | ||
| core | ||
| integration-tests | ||
| notifier-macos | ||
| plugins | ||
| web | ||