Resolve conflicts in app/policies/concerns/policy_actor.rb

4369fa6d · Stan Hu · ed6298ad · 4369fa6d
Commit 4369fa6d authored Jul 27, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/policies/concerns/policy_actor.rb app/policies/concerns/policy_actor.rb +0 -3

No files found.
--- a/app/policies/concerns/policy_actor.rb
+++ b/app/policies/concerns/policy_actor.rb
@@ -6,11 +6,8 @@
 module PolicyActor
  extend ActiveSupport::Concern

-<<<<<<< HEAD
  prepend EE::PolicyActor

-=======
->>>>>>> upstream/master
  def blocked?
    false
  end