diff options
Diffstat (limited to 'app/models/line_referential.rb')
| -rw-r--r-- | app/models/line_referential.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb index 0d7125a57..d8cf74bda 100644 --- a/app/models/line_referential.rb +++ b/app/models/line_referential.rb @@ -1,9 +1,5 @@ class LineReferential < ActiveRecord::Base -<<<<<<< HEAD include ObjectidFormatterSupport -======= - include ObjectidFormaterSupport ->>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941 extend StifTransportModeEnumerations extend Enumerize @@ -15,11 +11,7 @@ class LineReferential < ActiveRecord::Base has_many :networks, class_name: 'Chouette::Network' has_many :line_referential_syncs, -> { order created_at: :desc } has_many :workbenches -<<<<<<< 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 def add_member(organisation, options = {}) attributes = options.merge organisation: organisation |