diff options
| author | Guillaume | 2017-11-16 15:38:39 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-11-22 12:35:48 +0100 |
| commit | 7c032665a81d9b81f6267d9bb133e8f0ec3b9e21 (patch) | |
| tree | 58a6b4196bbb7f1e0a8951252e8da7fe772bc06e | |
| parent | 62282a0384394fadf395f48a7d2ca112d2aa3d27 (diff) | |
| download | chouette-core-7c032665a81d9b81f6267d9bb133e8f0ec3b9e21.tar.bz2 | |
Refs #4941 remove object_id_format_to_line_referential module, include just a object_id_format_to_referential module
| -rw-r--r-- | app/models/chouette/line.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb index d50395182..8d5ff5f60 100644 --- a/app/models/chouette/line.rb +++ b/app/models/chouette/line.rb @@ -1,4 +1,3 @@ -<<<<<<< HEAD module Chouette class Line < Chouette::ActiveRecord include LineRestrictions @@ -6,16 +5,6 @@ module Chouette include ObjectidSupport extend StifTransportModeEnumerations extend StifTransportSubmodeEnumerations -======= -class Chouette::Line < Chouette::ActiveRecord - include StifCodifligneAttributesSupport - include LineRestrictions - include LineReferentialSupport - include ObjectIdFormat - extend StifTransportModeEnumerations - extend StifTransportSubmodeEnumerations ->>>>>>> add object_id_format to migrations, create module for call Referential, Line Referential, StopAreaReferential in models, add Enumerize in models Refs #4941 - extend ActiveModel::Naming # FIXME http://jira.codehaus.org/browse/JRUBY-6358 |