diff options
| author | Xinhui Xu | 2017-11-30 11:09:36 +0100 | 
|---|---|---|
| committer | GitHub | 2017-11-30 11:09:36 +0100 | 
| commit | a7930abe5a70b8b964af0dcbf86fe0a587ea98cb (patch) | |
| tree | dc8e1a1ff57ff0328e4b8b2ac72932f82e379406 /app/models/chouette/line.rb | |
| parent | fb7ad0e23e73954e6e5d172d61edb31cd686b8b4 (diff) | |
| parent | 7b019504fd792293f1112b2375228505fab303fe (diff) | |
| download | chouette-core-a7930abe5a70b8b964af0dcbf86fe0a587ea98cb.tar.bz2 | |
Merge branch 'master' into 4981_last_editor
Diffstat (limited to 'app/models/chouette/line.rb')
| -rw-r--r-- | app/models/chouette/line.rb | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb index 16d7ec6f6..784e3f5b9 100644 --- a/app/models/chouette/line.rb +++ b/app/models/chouette/line.rb @@ -4,8 +4,8 @@ module Chouette      include LineRestrictions      include LineReferentialSupport      include ObjectidSupport -    extend StifTransportModeEnumerations -    extend StifTransportSubmodeEnumerations +    include StifTransportModeEnumerations +    include StifTransportSubmodeEnumerations      extend ActiveModel::Naming      # FIXME http://jira.codehaus.org/browse/JRUBY-6358 | 
