fix a merge conflict mistake for upload errors

9 years ago · 42aab4dca1
1 changed files with 1 additions and 1 deletions
--- a/static/js/upload.js
+++ b/static/js/upload.js
@ -73,7 +73,7 @@ Dropzone.options.dropzone = {
 		file.cancelActionElement = deleteAction;
 		file.fileActions.appendChild(deleteAction);
 	},
 	error: function(file, errMsg, xhrO) {
 	error: function(file, resp, xhrO) {
        file.fileActions.removeChild(file.cancelActionElement);
        file.fileActions.removeChild(file.progressElement);