From 42aab4dca17dee2d9e2a03c1898350f6d8814bf2 Mon Sep 17 00:00:00 2001
From: mutantmonkey <mutantmonkey@mutantmonkey.in>
Date: Sun, 4 Oct 2015 15:13:53 -0700
Subject: [PATCH] fix a merge conflict mistake for upload errors

---
 static/js/upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/upload.js b/static/js/upload.js
index 9c6b679..222332c 100644
--- 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);