# Conflicts: # default.conf # docker-compose.yml # frontend/Dockerfile # frontend/README.md # frontend/app/app.css # frontend/app/root.tsx # frontend/app/routes.ts # frontend/package.json # frontend/vite.config.ts
# Conflicts: # default.conf # docker-compose.yml # frontend/Dockerfile # frontend/README.md # frontend/app/app.css # frontend/app/root.tsx # frontend/app/routes.ts # frontend/package.json # frontend/vite.config.ts