Merge branch 'master' into new-attrs

This commit is contained in:
Nathan Weizenbaum 2009-07-04 15:43:33 -07:00
commit e9714ea91b
1 changed files with 2 additions and 2 deletions

View File

@ -269,9 +269,9 @@ module Sass::Script
# An incompatible coercion, e.g. between px and cm, will raise an error.
#
# @param num_units [Array<String>] The numerator units to coerce this number into.
# See {#numerator\_units}
# See {\#numerator\_units}
# @param den_units [Array<String>] The denominator units to coerce this number into.
# See {#denominator\_units}
# See {\#denominator\_units}
# @return [Number] The number with the new units
# @raise [Sass::UnitConversionError] if the given units are incompatible with the number's
# current units