From b854d492983fd8c1b708bfab570558c934eba774 Mon Sep 17 00:00:00 2001
From: twinturbo <me@broadcastingadam.com>
Date: Sat, 9 Feb 2013 21:03:11 +0100
Subject: [PATCH] Rebase against master

---
 lib/active_model/serializer.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index 72228b19..7c1c1409 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -302,8 +302,6 @@ module ActiveModel
     # Returns a hash representation of the serializable
     # object without the root.
     def serializable_hash
-<<<<<<< HEAD
-=======
       if perform_caching?
         cache.fetch expand_cache_key([self.class.to_s.underscore, cache_key, 'serializable-hash']) do
           _serializable_hash
@@ -455,7 +453,7 @@ module ActiveModel
       ActiveSupport::Notifications.instrument(event_name, payload, &block)
     end
   end
-  
+
   # DefaultSerializer
   #
   # Provides a constant interface for all items, particularly