Resolve conflicts in `gitlab_projects_import_service.rb`

dc6e4364 · Bob Van Landuyt · 32c0a93a · dc6e4364
Commit dc6e4364 authored Aug 01, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/projects/gitlab_projects_import_service.rb app/services/projects/gitlab_projects_import_service.rb +0 -3

No files found.
--- a/app/services/projects/gitlab_projects_import_service.rb
+++ b/app/services/projects/gitlab_projects_import_service.rb
@@ -5,10 +5,7 @@
 # The latter will under the hood just import an archive supplied by GitLab.
 module Projects
  class GitlabProjectsImportService
-<<<<<<< HEAD
    prepend ::EE::Projects::GitlabProjectsImportService
-=======
->>>>>>> upstream/master
    include Gitlab::Utils::StrongMemoize
    include Gitlab::TemplateHelper