add object_id_format to migrations, create module for call Referential, Line Referential, StopAreaReferential in models, add Enumerize in models Refs #4941

1 files changed, 10 insertions, 0 deletions

diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 780f6473f..d50395182 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 module Chouette
   class Line < Chouette::ActiveRecord
     include LineRestrictions
@@ -5,6 +6,15 @@ 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