Resolve conflict in spec/spec_helper.rb

26a5626d · Toon Claes · 001752b7 · 26a5626d
Commit 26a5626d authored Mar 28, 2018 by Toon Claes
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/spec_helper.rb spec/spec_helper.rb +0 -3

No files found.
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -104,7 +104,6 @@ RSpec.configure do |config|
    TestEnv.init
  end

-<<<<<<< HEAD
  # EE-specific start
  config.before(:all) do
    License.destroy_all
@@ -112,8 +111,6 @@ RSpec.configure do |config|
  end
  # EE-specific stop

-=======
->>>>>>> upstream/master
  config.after(:all) do
    TestEnv.clean_test_path
  end