diff options
| author | cedricnjanga | 2017-11-22 00:45:48 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-11-22 00:45:48 +0100 |
| commit | 510afa8b86fb6f5e4b7d9c39e3a6d3b071cd8ce9 (patch) | |
| tree | 1b3a162722389df4f6b2e444d03e91131032f0d5 /app/models/chouette/journey_pattern.rb | |
| parent | be2bd2e4f902ef12a21425ebe7dcf5699768762a (diff) | |
| parent | 96afaed78fa043449c0264ea09f0106147755c8e (diff) | |
| download | chouette-core-510afa8b86fb6f5e4b7d9c39e3a6d3b071cd8ce9.tar.bz2 | |
Merge branch 'master' into 4941-refactoring_object_id
Diffstat (limited to 'app/models/chouette/journey_pattern.rb')
| -rw-r--r-- | app/models/chouette/journey_pattern.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb index fb30ab69e..5058c95dc 100644 --- a/app/models/chouette/journey_pattern.rb +++ b/app/models/chouette/journey_pattern.rb @@ -148,6 +148,7 @@ module Chouette vjas.destroy end end +<<<<<<< HEAD def control_route_sections stop_area_ids = self.stop_points.map(&:stop_area_id) @@ -183,4 +184,8 @@ module Chouette end end end -end
\ No newline at end of file +end +======= + end +end +>>>>>>> master |