Resolve merge errors

This commit is contained in:
Karl Erik Õunapuu 2020-09-02 16:25:34 +03:00
commit 73e9dd6870
817 changed files with 16875 additions and 17443 deletions

View file

@ -1,5 +0,0 @@
class KeyrelayVersion < PaperTrail::Version
include VersionSession
self.table_name = :log_keyrelays
self.sequence_name = :log_keyrelays_id_seq
end

View file

@ -0,0 +1,4 @@
class PaymentOrderVersion < PaperTrail::Version
self.table_name = :log_payment_orders
self.sequence_name = :log_payment_orders_id_seq
end

View file

@ -0,0 +1,7 @@
class RegistrantVerificationVersion < PaperTrail::Version
include VersionSession
self.table_name = :log_registrant_verifications
self.sequence_name = :log_registrant_verifications_id_seq
scope :deleted, -> { where(event: 'destroy') }
end

View file

@ -0,0 +1,4 @@
class SettingEntryVersion < PaperTrail::Version
self.table_name = :log_setting_entries
self.sequence_name = :log_setting_entries
end