# Conflicts: # README.md # docker-compose.override.yml # docker-compose.prod.yml # docker-compose.yml # k8s/deploy.ps1 # k8s/ocelot/deployment.yaml # src/ApiGateways/ApiGw-Base/Dockerfile