diff options
| author | cedricnjanga | 2017-11-22 00:54:13 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-11-22 00:54:13 +0100 |
| commit | 921e5022928941b047089bfe8548c7b5c85e47a0 (patch) | |
| tree | a09043df26f69a346e548a3a61d53125125af98b /app/models | |
| parent | 510afa8b86fb6f5e4b7d9c39e3a6d3b071cd8ce9 (diff) | |
| download | chouette-core-921e5022928941b047089bfe8548c7b5c85e47a0.tar.bz2 | |
Fix merged file
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/chouette/route.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb index be86b5b04..d8e6533c4 100644 --- a/app/models/chouette/route.rb +++ b/app/models/chouette/route.rb @@ -191,13 +191,9 @@ module Chouette protected -<<<<<<< HEAD def self.vehicle_journeys_timeless(stop_point_id) all( :conditions => ['vehicle_journeys.id NOT IN (?)', Chouette::VehicleJourneyAtStop.where(stop_point_id: stop_point_id).pluck(:vehicle_journey_id)] ) end -======= - protected ->>>>>>> master end end
\ No newline at end of file |