Resolve lib/api/resource_label_events.rb

8cf6c4dc · Robert Speicher · 5404b1d9 · 8cf6c4dc
Commit 8cf6c4dc authored Sep 13, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/api/resource_label_events.rb
+++ b/lib/api/resource_label_events.rb
@@ -25,10 +25,7 @@ module API
          requires :eventable_id, types: [Integer, String], desc: 'The ID of the eventable'
          use :pagination
        end
-<<<<<<< HEAD
-=======

->>>>>>> upstream/master
        # rubocop: disable CodeReuse/ActiveRecord
        get ":id/#{eventables_str}/:eventable_id/resource_label_events" do
          eventable = find_noteable(parent_type, eventables_str, params[:eventable_id])