Resolve app/models/user.rb

7d668d1d · Robert Speicher · 8d05cb0b · 7d668d1d
Commit 7d668d1d authored Sep 13, 2018 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1056,13 +1056,10 @@ class User < ActiveRecord::Base
    SystemHooksService.new
  end
  # rubocop: enable CodeReuse/ServiceClass
-<<<<<<< HEAD

  def admin_unsubscribe!
    update_column :admin_email_unsubscribed_at, Time.now
  end
-=======
->>>>>>> upstream/master

  def starred?(project)
    starred_projects.exists?(project.id)