# Conflicts: # apps/client/package.json # apps/client/src/index.ts # apps/server/package.json # apps/server/src/index.ts |
||
---|---|---|
apps | ||
server | ||
.gitignore | ||
.prettierrc.yaml | ||
package.json | ||
pnpm-workspace.yaml | ||
tsconfig.json |
# Conflicts: # apps/client/package.json # apps/client/src/index.ts # apps/server/package.json # apps/server/src/index.ts |
||
---|---|---|
apps | ||
server | ||
.gitignore | ||
.prettierrc.yaml | ||
package.json | ||
pnpm-workspace.yaml | ||
tsconfig.json |