Permalink
Browse files

fixing a bad merge

Conflicts:

	lib/formtastic.rb
  • Loading branch information...
1 parent f7decee commit f2a9ff4bab40659496471eb52161388e90463656 @justinfrench committed Dec 20, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/formtastic.rb
View
2 lib/formtastic.rb
@@ -1694,7 +1694,7 @@ def get_maxlength_for(method)
if type == :text
{ :rows => default_text_area_height,
:cols => default_text_area_width }
- elsif (type == :numeric) || !column.respond_to?(:limit) || column.nil? || column.limit.nil?
+ elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
{ :maxlength => validation_max_limit,
:size => default_text_field_size }
else

0 comments on commit f2a9ff4

Please sign in to comment.