Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

1 files changed, 6 insertions, 6 deletions

diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index d2bd160dc7..b998a59e81 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -22,18 +22,18 @@ module ActiveModel
   #   cm.to_param         # => nil
   #
   module Conversion
-    # If your object is already designed to implement all of the Active Model 
-    # you can use the default to_model implementation, which simply returns 
+    # If your object is already designed to implement all of the Active Model
+    # you can use the default to_model implementation, which simply returns
     # self.
-    # 
-    # If your model does not act like an Active Model object, then you should 
-    # define <tt>:to_model</tt> yourself returning a proxy object that wraps 
+    #
+    # If your model does not act like an Active Model object, then you should
+    # define <tt>:to_model</tt> yourself returning a proxy object that wraps
     # your object with Active Model compliant methods.
     def to_model
       self
     end
 
-    # Returns an Enumerable of all (primary) key attributes or nil if 
+    # Returns an Enumerable of all (primary) key attributes or nil if
     # persisted? is false
     def to_key
       persisted? ? [id] : nil