Resolve conflicts

ksharma-xyz · Sep 20, 2024 · d054212 · d054212
1 parent 2cdcf9d
commit d054212
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...work/api/src/main/kotlin/xyz/ksharma/krail/trip_planner/network/api/model/TripResponse.kt b/...work/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<PathDescription>? = 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<FootPathInfo>? = null,
         @SerialName("coords") val coords: List<List<Double>>,