Fix conflict in lib/banzai/issuable_extractor.rb

d9790a61 · Douglas Barbosa Alexandre · ec9be16d · d9790a61
Commit d9790a61 authored Oct 31, 2018 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/banzai/issuable_extractor.rb lib/banzai/issuable_extractor.rb +0 -3

No files found.
--- a/lib/banzai/issuable_extractor.rb
+++ b/lib/banzai/issuable_extractor.rb
@@ -9,11 +9,8 @@ module Banzai
  # so we can avoid N+1 queries problem

  class IssuableExtractor
-<<<<<<< HEAD
    prepend EE::Banzai::IssuableExtractor

-=======
->>>>>>> upstream/master
    attr_reader :context

    ISSUE_REFERENCE_TYPE = '@data-reference-type="issue"'.freeze