Solved features/support/env.rb

75cacd70 · Jose Ivan Vargas · 11f44676 · 75cacd70
Commit 75cacd70 authored Jan 11, 2018 by Jose Ivan Vargas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

features/support/env.rb features/support/env.rb +0 -3

No files found.
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -21,11 +21,8 @@ end
  require Rails.root.join('spec', 'support', f)
 end

-<<<<<<< HEAD
 Dir["#{Rails.root}/features/steps/shared/*.rb"].each { |file| require file }

-=======
->>>>>>> upstream/master
 Spinach.hooks.before_run do
  include RSpec::Mocks::ExampleMethods
  include ActiveJob::TestHelper