Skip to content

Commit

Permalink
Fix whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
dkubb committed Jan 12, 2012
1 parent eac8972 commit 5bde03a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions lib/virtus/attribute.rb
Expand Up @@ -112,17 +112,17 @@ def self.determine_type(class_or_name)
#
# @param [#to_sym] name
# A hook for Attributes to update options based on the type from the caller
#
#
# @param [Object] type
# The raw type, typically given by the caller of ClassMethods#attribute
# @param [Hash] options
# Attribute configuration options
#
#
# @return [Hash]
# New Hash instance, potentially updated with information from the args
#
#
# @api private
#
#
# @todo add type arg to Attribute#initialize signature and handle there?
def self.merge_options(type, options)
options
Expand Down
2 changes: 1 addition & 1 deletion lib/virtus/attribute/embedded_value.rb
Expand Up @@ -30,7 +30,7 @@ class EmbeddedValue < Object
#
# @return [Hash]
# an updated options hash for configuring an EmbeddedValue instance
#
#
# @api private
def self.merge_options(type, options)
options.merge(:model => type)
Expand Down

0 comments on commit 5bde03a

Please sign in to comment.