mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-22 17:25:25 +00:00
Merge conflicts
This commit is contained in:
commit
cf5ba465a6
1 changed files with 1 additions and 2 deletions
|
|
@ -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.'));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue