Permalink
Browse files

commenting a conditional back in

  • Loading branch information...
1 parent 360d427 commit 0e597b4316b65cd3f6ab22b010b4a6fbe7ad525c @Bringo Bringo committed Jan 11, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 app/models/asset.rb
View
@@ -352,7 +352,7 @@ def merge(new_asset)
current_fields << fields
end
else
- current_fields << fields # unless current_attrs.include?(clean_attributes(fields.attributes))
+ current_fields << fields unless current_attrs.include?(clean_attributes(fields.attributes))
end
end
end

0 comments on commit 0e597b4

Please sign in to comment.