From d0542128fe2bd96a9dba528bd5611a4974afb47e Mon Sep 17 00:00:00 2001 From: Karan Sharma <55722391+ksharma-xyz@users.noreply.github.com> Date: Fri, 20 Sep 2024 21:14:22 +1000 Subject: [PATCH] Resolve conflicts --- .../krail/trip_planner/network/api/model/TripResponse.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/feature/trip-planner/network/api/src/main/kotlin/xyz/ksharma/krail/trip_planner/network/api/model/TripResponse.kt b/feature/trip-planner/network/api/src/main/kotlin/xyz/ksharma/krail/trip_planner/network/api/model/TripResponse.kt index a695b8bd..bfa3eadc 100644 --- a/feature/trip-planner/network/api/src/main/kotlin/xyz/ksharma/krail/trip_planner/network/api/model/TripResponse.kt +++ b/feature/trip-planner/network/api/src/main/kotlin/xyz/ksharma/krail/trip_planner/network/api/model/TripResponse.kt @@ -38,8 +38,12 @@ data class TripResponse( @SerialName("origin") val origin: StopSequenceClass, @SerialName("destination") val destination: StopSequenceClass, @SerialName("pathDescriptions") val pathDescriptions: List? = null, - @SerialName("isRealtimeControlled") val isRealtimeControlled: Boolean, + @SerialName("isRealtimeControlled") val isRealtimeControlled: Boolean? = null, @SerialName("transportation") val transportation: Transportation, + + /** + * In seconds + */ @SerialName("duration") val duration: Long, @SerialName("footPathInfo") val footPathInfo: List? = null, @SerialName("coords") val coords: List>,