resolve conflicts

This commit is contained in:
Daniela Arcese 2017-06-20 15:48:08 -04:00
commit 8bc1cb4e63

View file

@ -27,7 +27,7 @@ $(document).ready(function() {
$btn.attr('disabled', 'true'); $btn.attr('disabled', 'true');
} }
}); });
fileReceiver fileReceiver
.download() .download()
.catch(() => { .catch(() => {