diff options
| author | cedricnjanga | 2017-11-22 01:00:12 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-11-22 01:00:12 +0100 |
| commit | 148d8ba1f38c78709695d0f4534a38696e3ccbbd (patch) | |
| tree | 29f72342839ce9429c60e7cd7a2a4ba9335122cc /app/models | |
| parent | 921e5022928941b047089bfe8548c7b5c85e47a0 (diff) | |
| download | chouette-core-148d8ba1f38c78709695d0f4534a38696e3ccbbd.tar.bz2 | |
Fix merge
Diffstat (limited to 'app/models')
| -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 |