resolve ee/spec/spec_helper

4a556dcb · Valery Sizov · 7a709b84 · 4a556dcb
Commit 4a556dcb authored Aug 20, 2018 by Valery Sizov
Show 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
@@ -30,11 +30,8 @@ end
 # require rainbow gem String monkeypatch, so we can test SystemChecks
 require 'rainbow/ext/string'
 Rainbow.enabled = false
-<<<<<<< HEAD

 require_relative '../ee/spec/spec_helper'
-=======
->>>>>>> upstream/master

 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.