Resolve conflicts in spec/support/helpers/migrations_helpers.rb

47a215e5 · Stan Hu · be83fe3e · 47a215e5
Commit 47a215e5 authored Nov 07, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/support/helpers/migrations_helpers.rb spec/support/helpers/migrations_helpers.rb +0 -3

No files found.
--- a/spec/support/helpers/migrations_helpers.rb
+++ b/spec/support/helpers/migrations_helpers.rb
 module MigrationsHelpers
-<<<<<<< HEAD
  prepend EE::MigrationsHelpers

-=======
->>>>>>> upstream/master
  def active_record_base
    ActiveRecord::Base
  end