diff options
| -rw-r--r-- | app/models/chouette/journey_pattern.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb index 5058c95dc..0c1905286 100644 --- a/app/models/chouette/journey_pattern.rb +++ b/app/models/chouette/journey_pattern.rb @@ -148,7 +148,6 @@ module Chouette vjas.destroy end end -<<<<<<< HEAD def control_route_sections stop_area_ids = self.stop_points.map(&:stop_area_id) @@ -185,7 +184,3 @@ module Chouette end end end -======= - end -end ->>>>>>> master |