Resolve conflicts in `resource_label_event.rb`

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

Showing with 0 additions and 3 deletions

app/models/resource_label_event.rb app/models/resource_label_event.rb +0 -3

No files found.
--- a/app/models/resource_label_event.rb
+++ b/app/models/resource_label_event.rb
@@ -3,11 +3,8 @@
 # This model is not used yet, it will be used for:
 # https://gitlab.com/gitlab-org/gitlab-ce/issues/48483
 class ResourceLabelEvent < ActiveRecord::Base
-<<<<<<< HEAD
  prepend EE::ResourceLabelEvent

-=======
->>>>>>> upstream/master
  belongs_to :user
  belongs_to :issue
  belongs_to :merge_request