paperclip

In the attachment file on line 183 there some conflicting code that was not corrected.

def post_process #:nodoc:

return if @queued_for_write[:original].nil?

@styles.each do |name, args|

begin

dimensions, format = args

@queued_for_write[name] = Thumbnail.make(@queued_for_write[:original],

<<<<<<< HEAD:lib/paperclip/attachment.rb

dimensions,

format,

@whiny_thumnails)

=======

dimensions,

format,

@whiny_thumnails)

>>>>>>> Do not hold open File/Tempfile instances around:lib/paperclip/attachment.rb

rescue Errno::ENOENT => e

@errors << "could not be processed because the file does not exist."

rescue PaperclipError => e

@errors << e.message

end

end

end