Merge branch 'ce-to-ee' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee

290285d2 · Shinya Maeda · b2a60a2f · 25fe0ae8 · 290285d2
Commit 290285d2 authored Oct 10, 2017 by Shinya Maeda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/support/project_forks_helper.rb spec/support/project_forks_helper.rb +0 -4

No files found.
--- a/spec/support/project_forks_helper.rb
+++ b/spec/support/project_forks_helper.rb
@@ -52,11 +52,7 @@ module ProjectForksHelper
    TestEnv.copy_repo(forked_project,
                      bare_repo: TestEnv.forked_repo_path_bare,
                      refs: TestEnv::FORKED_BRANCH_SHA)
-<<<<<<< HEAD
    forked_project.repository.after_import
-=======
->>>>>>> ce-com/master
    forked_project
  end
 end