resolve conflict in

app/services/projects/hashed_storage/migrate_repository_service.rb

resolve conflict in
app/services/projects/hashed_storage/migrate_repository_service.rb
61f18e90 · Lukas Eipert · 04e6d31b · 61f18e90
Commit 61f18e90 authored Aug 03, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

app/services/projects/hashed_storage/migrate_repository_service.rb ...ces/projects/hashed_storage/migrate_repository_service.rb +0 -5

No files found.
--- a/app/services/projects/hashed_storage/migrate_repository_service.rb
+++ b/app/services/projects/hashed_storage/migrate_repository_service.rb
@@ -5,15 +5,10 @@ module Projects
    class MigrateRepositoryService < BaseService
      include Gitlab::ShellAdapter

-<<<<<<< HEAD
      prepend ::EE::Projects::HashedStorage::MigrateRepositoryService

      attr_reader :old_disk_path, :new_disk_path, :old_wiki_disk_path, :old_storage_version, :logger, :move_wiki

-=======
-      attr_reader :old_disk_path, :new_disk_path, :old_wiki_disk_path, :old_storage_version, :logger, :move_wiki
-
->>>>>>> upstream/master
      def initialize(project, old_disk_path, logger: nil)
        @project = project
        @logger = logger || Rails.logger