lib/ruby-box/folder.rb in ruby-box-1.8.0 vs lib/ruby-box/folder.rb in ruby-box-1.8.1

@@ -20,13 +20,11 @@
       })
 
       begin
         resp = file.upload_content(data) #write a new file. If there is a conflict, update the conflicted file.
       rescue RubyBox::ItemNameInUse => e
-        file = RubyBox::File.new(@session, {
-          'id' => e['context_info']['conflicts'][0]['id']
-        })
         data.rewind
+        file = files(filename).first
         resp = file.update_content( data )
       end
     end
 
     def create_subfolder(name)
\ No newline at end of file