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

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

Resolve conflict in app/services/projects/hashed_storage/migrate_attachments_service.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
cfdab57f · Rémy Coutable · 241da0a1 · cfdab57f
Commit cfdab57f 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_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
@@ -5,11 +5,8 @@ module Projects
    class MigrateAttachmentsService < BaseService
      attr_reader :logger, :old_path, :new_path

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

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