From 921e5022928941b047089bfe8548c7b5c85e47a0 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 22 Nov 2017 00:54:13 +0100
Subject: Fix merged file

---
 app/models/chouette/route.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app')

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
-- 
cgit v1.2.3