mirror of
https://github.com/opentripplanner/OpenTripPlanner.git
synced 2026-04-03 05:51:24 +02:00
# Conflicts: # application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeTripUpdateAdapter.java # Conflicts: # application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java # application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java # application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java # Conflicts: # application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java |
||
|---|---|---|
| .. | ||
| AreaStopPropertyMapperTest.java | ||
| AreaStopsLayerBuilderTest.java | ||