diff options
Diffstat (limited to 'app/models/chouette/route.rb')
| -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 |