# Conflicts: # docker-compose.vs.debug.yml # docker-compose.vs.release.yml # eShopOnContainers-ServicesAndWebApps.sln # src/Services/Location/Locations.API/Startup.cs # src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs # src/Services/Marketing/Marketing.API/Marketing.API.csproj # src/Services/Marketing/Marketing.API/Startup.cs # src/Web/WebMVC/appsettings.json # src/Web/WebSPA/AppSettings.cs # test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs