Resolve conflict in spec/support/helpers/stub_configuration.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in spec/support/helpers/stub_configuration.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
491acf3b · Rémy Coutable · d8e41083 · 491acf3b
Commit 491acf3b authored Apr 23, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/spec/support/helpers/stub_configuration.rb
+++ b/spec/support/helpers/stub_configuration.rb
 require 'active_support/core_ext/hash/transform_values'
 require 'active_support/hash_with_indifferent_access'

-<<<<<<< HEAD:spec/support/helpers/stub_configuration.rb
 require_dependency Gitlab.root.join('ee/spec/support/helpers/ee/stub_configuration')

-=======
->>>>>>> upstream/master:spec/support/helpers/stub_configuration.rb
 module StubConfiguration
  prepend EE::StubConfiguration