Resolve lib/api/discussions.rb

bf7a354f · Robert Speicher · f61463dc · bf7a354f
Commit bf7a354f authored May 01, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

lib/api/discussions.rb lib/api/discussions.rb +0 -4

No files found.
--- a/lib/api/discussions.rb
+++ b/lib/api/discussions.rb
@@ -5,11 +5,7 @@ module API
    before { authenticate! }
-<<<<<<< HEAD
    NOTEABLE_TYPES = [Issue, Snippet, Epic, MergeRequest, Commit].freeze
-=======
-    NOTEABLE_TYPES = [Issue, Snippet, MergeRequest, Commit].freeze
->>>>>>> upstream/master
    NOTEABLE_TYPES.each do |noteable_type|
      parent_type = noteable_type.parent_class.to_s.underscore