Fix EE-specific conflict in fixture stubbed feature

cf90fddc · Eric Eastwood · 572e10e8 · cf90fddc
Commit cf90fddc authored Feb 07, 2018 by Eric Eastwood
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/javascripts/fixtures/projects.rb spec/javascripts/fixtures/projects.rb +0 -3

No files found.
--- a/spec/javascripts/fixtures/projects.rb
+++ b/spec/javascripts/fixtures/projects.rb
@@ -18,10 +18,7 @@ describe 'Projects (JavaScript fixtures)', type: :controller do
  before do
    # EE-specific start
-<<<<<<< HEAD
    stub_licensed_features(variable_environment_scope: true)
-=======
->>>>>>> upstream/master
    # EE specific end
    project.add_master(admin)
    sign_in(admin)