resolve conflict in

app/services/projects/hashed_storage/migrate_attachments_service.rb

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

Showing with 0 additions and 3 deletions

app/services/projects/hashed_storage/migrate_attachments_service.rb ...es/projects/hashed_storage/migrate_attachments_service.rb +0 -3

No files found.
--- a/app/services/projects/hashed_storage/migrate_attachments_service.rb
+++ b/app/services/projects/hashed_storage/migrate_attachments_service.rb
@@ -7,11 +7,8 @@ module Projects
    class MigrateAttachmentsService < BaseService
      attr_reader :logger, :old_disk_path, :new_disk_path

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

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