Fix conflicts in `app/policies/project_policy.rb`

e6fd6de1 · Bob Van Landuyt · c4280a1a · e6fd6de1
Commit e6fd6de1 authored Apr 12, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/policies/project_policy.rb app/policies/project_policy.rb +0 -3

No files found.
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
 class ProjectPolicy < BasePolicy
  extend ClassMethods
-<<<<<<< HEAD
  prepend EE::ProjectPolicy
-=======
->>>>>>> upstream/master

  READONLY_FEATURES_WHEN_ARCHIVED = %i[
    issue