Create objectid format and integrate it in models. Work in progress. Refs #4941

1 files changed, 8 insertions, 0 deletions

diff --git a/app/models/referential.rb b/app/models/referential.rb
index fa6bcbcf1..372f303f1 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -1,6 +1,10 @@
 class Referential < ActiveRecord::Base
   include DataFormatEnumerations
+<<<<<<< HEAD
   include ObjectidFormatterSupport
+=======
+  include ObjectidFormaterSupport
+>>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
   extend Enumerize
 
   validates_presence_of :name
@@ -56,7 +60,11 @@ class Referential < ActiveRecord::Base
 
   belongs_to :referential_suite
 
+<<<<<<< HEAD
   enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex'
+=======
+  enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne)
+>>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
 
   scope :ready, -> { where(ready: true) }
   scope :in_periode, ->(periode) { where(id: referential_ids_in_periode(periode)) }