Skip to content

G
gitlab-ce
Commit 491acf3b authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

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

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent d8e41083
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spec/support/helpers/stub_configuration.rb
View file @ 491acf3b
require 'active_support/core_ext/hash/transform_values' require 'active_support/core_ext/hash/transform_values'
require 'active_support/hash_with_indifferent_access' 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') require_dependency Gitlab.root.join('ee/spec/support/helpers/ee/stub_configuration')
=======
>>>>>>> upstream/master:spec/support/helpers/stub_configuration.rb
module StubConfiguration module StubConfiguration
prepend EE::StubConfiguration prepend EE::StubConfiguration
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7