# Conflicts: # packages/app/client/src/pages/index.tsx # packages/core/client/src/application/Application.tsx # packages/core/client/src/file-manager/index.ts # packages/plugins/file-manager/package.json # packages/plugins/file-manager/src/client/FileStorage.tsx # packages/plugins/file-manager/src/client/FileStorageShortcut.tsx  | 
			||
|---|---|---|
| .. | ||
| src | ||
| .buildrc.ts | ||
| .npmignore | ||
| .umirc.ts | ||
| contributing.md | ||
| develop.md | ||
| intro.md | ||
| package.json | ||