Merge conflicts

This commit is contained in:
Stoyan Zlatev 2025-10-30 14:54:35 +02:00
commit cf5ba465a6

View file

@ -205,7 +205,6 @@
delete item.itemId; delete item.itemId;
return item; return item;
}); });
if (uploadedFile.error) { if (uploadedFile.error) {
console.warn('File upload warning:', uploadedFile.error); console.warn('File upload warning:', uploadedFile.error);
toast.warning(uploadedFile.error); toast.warning(uploadedFile.error);
@ -216,7 +215,7 @@
} else { } else {
await addFileHandler(uploadedFile.id); await addFileHandler(uploadedFile.id);
} }
} }
} else { } else {
toast.error($i18n.t('Failed to upload file.')); toast.error($i18n.t('Failed to upload file.'));
} }