Resolve conflicts in `change_labels_service.rb`

5d1a3964 · Bob Van Landuyt · 47b21c71 · 5d1a3964
Commit 5d1a3964 authored Aug 01, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/resource_events/change_labels_service.rb app/services/resource_events/change_labels_service.rb +0 -3

No files found.
--- a/app/services/resource_events/change_labels_service.rb
+++ b/app/services/resource_events/change_labels_service.rb
@@ -4,11 +4,8 @@
 # https://gitlab.com/gitlab-org/gitlab-ce/issues/48483
 module ResourceEvents
  class ChangeLabelsService
-<<<<<<< HEAD
    prepend EE::ResourceEvents::ChangeLabelsService

-=======
->>>>>>> upstream/master
    attr_reader :resource, :user

    def initialize(resource, user)