Resolved redact_link conflict

4f34d471 · Jan Provaznik · cbb9634f · 4f34d471
Commit 4f34d471 authored Oct 30, 2018 by Jan Provaznik
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
@@ -4,11 +4,8 @@
 module Gitlab
  module BackgroundMigration
    class RedactLinks
-<<<<<<< HEAD
      prepend EE::Gitlab::BackgroundMigration::RedactLinks

-=======
->>>>>>> upstream/master
      module Redactable
        extend ActiveSupport::Concern