0
@@ -320,40 +320,6 @@
0
 
0
 
0
     include Scopes
0
-<<<<<<< HEAD:hobo/lib/hobo/model.rb
0
-    
0
-    def to_url_path
0
-      "#{self.class.to_url_path}/#{to_param}" unless new_record?
0
-    end
0
-    
0
-    
0
-    def with_acting_user(user)
0
-      old = acting_user
0
-      self.acting_user = user
0
-      result = yield
0
-      self.acting_user = old
0
-      result
0
-    end
0
-    
0
-    
0
-    def user_changes(user, changes={})
0
-      with_acting_user user do
0
-        if new_record?
0
-          self.attributes = changes
0
-          set_creator(user) 
0
-          Hobo.can_create?(user, self)
0
-        else
0
-          original = duplicate
0
-          # 'duplicate' can cause these to be set, but they can conflict
0
-          # with the changes so we clear them
0
-          clear_aggregation_cache
0
-          clear_association_cache
0
-          
0
-          self.attributes = changes
0
-          
0
-          Hobo.can_update?(user, original, self)
0
-        end
0
-=======
0
 
0
 
0
     def to_url_path
0
@@ -376,7 +342,6 @@
0
         self.attributes = changes
0
 
0
         Hobo.can_update?(user, original, self)
0
->>>>>>> me/hobo_the_gem:hobo/lib/hobo/model.rb
0
       end
0
     end
0
 
0
0
@@ -423,11 +388,8 @@
0
       send(:attributes_without_hobo_type_conversion=, converted, guard_protected_attributes)
0
     end
0
 
0
-<<<<<<< HEAD:hobo/lib/hobo/model.rb
0
-=======
0
 
0
 
0
->>>>>>> me/hobo_the_gem:hobo/lib/hobo/model.rb
0
     def set_creator(user)
0
       set_creator!(user) unless get_creator
0
     end