Resolve conflict in app/services/projects/hashed_storage/migrate_repository_service.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/services/projects/hashed_storage/migrate_repository_service.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
5497ee6a · Rémy Coutable · cfdab57f · 5497ee6a
Commit 5497ee6a authored Nov 29, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

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

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

-=======
->>>>>>> upstream/master
      attr_reader :old_disk_path, :new_disk_path, :old_wiki_disk_path, :old_storage_version, :logger

      def initialize(project, logger = nil)