# Conflicts: # apps/cli/package.json # packages/core/tools/tests/gen-tool-catalog.spec.ts |
||
|---|---|---|
| .. | ||
| base.cordis.yml | ||
| core-web.cordis.yml | ||
| tui.cordis.yml | ||
| web.cordis.yml | ||
# Conflicts: # apps/cli/package.json # packages/core/tools/tests/gen-tool-catalog.spec.ts |
||
|---|---|---|
| .. | ||
| base.cordis.yml | ||
| core-web.cordis.yml | ||
| tui.cordis.yml | ||
| web.cordis.yml | ||