# Conflicts: # App/CLAUDE.md # App/components/layout/sidebar.tsx # App/lib/feature-flags.ts |
||
|---|---|---|
| .. | ||
| (auth)/login | ||
| (portal) | ||
| actions | ||
| api | ||
| globals.css | ||
| layout.tsx | ||
| page.tsx | ||
# Conflicts: # App/CLAUDE.md # App/components/layout/sidebar.tsx # App/lib/feature-flags.ts |
||
|---|---|---|
| .. | ||
| (auth)/login | ||
| (portal) | ||
| actions | ||
| api | ||
| globals.css | ||
| layout.tsx | ||
| page.tsx | ||