Resolve Identity::UniquenessScopes conflict

89348b0f · Yorick Peterse · 784ab270 · 89348b0f
Commit 89348b0f authored Nov 13, 2018 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/identity/uniqueness_scopes.rb app/models/identity/uniqueness_scopes.rb +0 -3

No files found.
--- a/app/models/identity/uniqueness_scopes.rb
+++ b/app/models/identity/uniqueness_scopes.rb
@@ -9,8 +9,5 @@ class Identity < ActiveRecord::Base
    end
  end
 end
-<<<<<<< HEAD
 Identity::UniquenessScopes.prepend(EE::Identity::UniquenessScopes)
-=======
->>>>>>> upstream/master