Fix model conflicts

571e9fdd · Nick Thomas · 1f65c326 · 571e9fdd · 571e9fdd
Commit 571e9fdd authored Jun 30, 2017 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

app/models/ability.rb app/models/ability.rb +0 -4

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

No files found.
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
-<<<<<<< HEAD
-require 'declarative_policy'
-=======
 require_dependency 'declarative_policy'
->>>>>>> ce/master

 class Ability
  class << self

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -12,11 +12,9 @@ class User < ActiveRecord::Base
  include TokenAuthenticatable
  include IgnorableColumn
  include FeatureGate
-<<<<<<< HEAD
+
  prepend EE::GeoAwareAvatar
  prepend EE::User
-=======
->>>>>>> ce/master

  DEFAULT_NOTIFICATION_LEVEL = :participating