MAmattmerge: resolve conflict in TabBar.tsx — keep both Activity icon and formatShortcut import02940ce8 months agoHistory

Name	Last commit message	Last commit date
..
linkedTool
BaseItem.tsx
baseItemHelpers.ts
ExecutionTrace.tsx
LinkedToolItem.tsx
MetricsPill.tsx
SlashItem.tsx
SubagentItem.tsx
TeammateMessageItem.tsx
TextItem.tsx
ThinkingItem.tsx