Skip to content

G
gitlab-ce
Commit 918620c7 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in spec/spec_helper.rb

parent 8476aa71
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spec/spec_helper.rb
View file @ 918620c7
...@@ -70,13 +70,10 @@ RSpec.configure do |config| ...@@ -70,13 +70,10 @@ RSpec.configure do |config|
config.include StubFeatureFlags config.include StubFeatureFlags
config.include StubENV config.include StubENV
config.include ExpectOffense config.include ExpectOffense
<<<<<<< HEAD
# EE only # EE only
config.include EE::LicenseHelpers config.include EE::LicenseHelpers
config.include Rails.application.routes.url_helpers, type: :routing config.include Rails.application.routes.url_helpers, type: :routing
=======
>>>>>>> upstream/master
config.infer_spec_type_from_file_location! config.infer_spec_type_from_file_location!
......
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