Resolve conflicts in lib/gitlab/background_migration/redact_links.rb

c3bde0aa · Stan Hu · 556a026c · c3bde0aa
Commit c3bde0aa authored Nov 09, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/background_migration/redact_links.rb lib/gitlab/background_migration/redact_links.rb +0 -3

No files found.
--- a/lib/gitlab/background_migration/redact_links.rb
+++ b/lib/gitlab/background_migration/redact_links.rb
@@ -6,11 +6,8 @@ require_relative 'redact_links/redactable'
 module Gitlab
  module BackgroundMigration
    class RedactLinks
-<<<<<<< HEAD
      prepend EE::Gitlab::BackgroundMigration::RedactLinks

-=======
->>>>>>> upstream/master
      class Note < ActiveRecord::Base
        include EachBatch
        include ::Gitlab::BackgroundMigration::RedactLinks::Redactable