Whatever.

paper-trail-gem · Jan 15, 2016 · e96a35c · e96a35c
2 parents 32ffa31 + 83edfea
commit e96a35c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/paper_trail/has_paper_trail.rb b/lib/paper_trail/has_paper_trail.rb
@@ -121,8 +121,12 @@ def paper_trail_on_destroy(recording_order = 'before')
           fail ArgumentError, 'recording order can only be "after" or "before"'
         end
 
+<<<<<<< HEAD
         if recording_order == 'after' and
           Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5")
+=======
+        if recording_order == 'after' and ::ActiveRecord::VERSION::MAJOR >= 5
+>>>>>>> 83edfea02fd5112724179fe4e9218b287dce1493
           if ::ActiveRecord::Base.belongs_to_required_by_default
             ::ActiveSupport::Deprecation.warn(
               "paper_trail_on_destroy(:after) is incompatible with ActiveRecord " +