Resolve app/models/project_authorization.rb

06f265a4 · Robert Speicher · e2584841 · 06f265a4
Commit 06f265a4 authored Sep 17, 2018 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/models/project_authorization.rb
+++ b/app/models/project_authorization.rb
@@ -2,10 +2,7 @@

 class ProjectAuthorization < ActiveRecord::Base
  include FromUnion
-<<<<<<< HEAD
  prepend ::EE::ProjectAuthorization
-=======
->>>>>>> upstream/master

  belongs_to :user
  belongs_to :project