fix label event conflict

4a198baa · Jan Provaznik · cb991ffc · 4a198baa
Commit 4a198baa authored Sep 07, 2018 by Jan Provaznik
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,10 +3,7 @@
 # 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
  include Importable
  include Gitlab::Utils::StrongMemoize
  include CacheMarkdownField