attachmentsme/ruby-box — pull request #93 by ismell (2014-06-03 21:27:31+00:00)
Title: Re-uploading existing file was failing

The context_info contains a conflicts hash or a conflicts array depending on the number of conflicts. We should make sure we handle both cases correctly.