Fixed api conflict

53bf08fa · Jan Provaznik · 1854f24b · 53bf08fa
Commit 53bf08fa authored Sep 07, 2018 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/lib/api/resource_label_events.rb
+++ b/lib/api/resource_label_events.rb
@@ -7,11 +7,7 @@ module API

    before { authenticate! }

-<<<<<<< HEAD
    EVENTABLE_TYPES = [Issue, Epic, MergeRequest].freeze
-=======
-    EVENTABLE_TYPES = [Issue, MergeRequest].freeze
->>>>>>> upstream/master

    EVENTABLE_TYPES.each do |eventable_type|
      parent_type = eventable_type.parent_class.to_s.underscore