Dev branch had changed datasource URLs to env vars (SPRING_DATASOURCE_URL etc.) for k8s deployments, but route-processing uses parametric config-server URLs for local development. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Conflict resolution: - build.gradle.kts: dev version (keep nstart.cloud repo + jacoco/asm mavenCentral) - settings.gradle.kts: project name from route-processing (observatio-terrae), rest from dev - config addresses (application-local, pcp-mission-planing-service, pcp-dynamic-plan application.yaml): dev versions - menu.html: merged both branches (TGU planning + bookings items) - CatalogControllerTest.kt: merged both mocks (TguPlanningService + BallisticsService) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Дмитрий Соловьев