Merge branch 'dev' into route-processing
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>
This commit is contained in:
@@ -40,6 +40,7 @@ settings:
|
||||
tgu-service: ${pcp.services.tgu}
|
||||
satellite-catalog-service: ${pcp.services.satellite-catalog}
|
||||
ballistics-service: ${pcp.services.ballistics}
|
||||
tle-monitoring-service: ${pcp.services.tle-monitoring}
|
||||
stations-service: ${pcp.services.stations}
|
||||
slots-service: ${pcp.services.slots}
|
||||
mission-service: ${pcp.services.mission}
|
||||
|
||||
Reference in New Issue
Block a user