Skip to content

G
gitlab-ce
Commit dc6e4364 authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

Resolve conflicts in `gitlab_projects_import_service.rb`

parent 32c0a93a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/services/projects/gitlab_projects_import_service.rb
View file @ dc6e4364
...@@ -5,10 +5,7 @@ ...@@ -5,10 +5,7 @@
# The latter will under the hood just import an archive supplied by GitLab. # The latter will under the hood just import an archive supplied by GitLab.
module Projects module Projects
class GitlabProjectsImportService class GitlabProjectsImportService
<<<<<<< HEAD
prepend ::EE::Projects::GitlabProjectsImportService prepend ::EE::Projects::GitlabProjectsImportService
=======
>>>>>>> upstream/master
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
include Gitlab::TemplateHelper include Gitlab::TemplateHelper
......
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