diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/chouette/stop_area.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb index bb8747faa..69aed144b 100644 --- a/app/models/chouette/stop_area.rb +++ b/app/models/chouette/stop_area.rb @@ -11,8 +11,11 @@ module Chouette extend Enumerize enumerize :area_type, in: Chouette::AreaType::ALL enumerize :kind, in: %i(commercial non_commercial) +<<<<<<< HEAD AVAILABLE_LOCALIZATIONS = %i(gb nl de fr it es) +======= +>>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas with_options dependent: :destroy do |assoc| assoc.has_many :stop_points |