mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
demo merge conflict
This commit is contained in:
parent
ae1167bd94
commit
02cb45c3cb
|
@ -124,7 +124,7 @@ function encodeBase64(buffer: Uint8Array, padded = true, urlSafe = false) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildMetadata(b64: string, cell: vscode.NotebookCell, filename: string, filetype: string, startingAttachments: any): { [key: string]: any } {
|
function buildMetadata(b64: string, cell: vscode.NotebookCell, filename: string, filetype: string, startingAttachments: any): { [key: string]: any } {
|
||||||
const outputMetadata = { ...cell.metadata };
|
const outputMetadata = {};
|
||||||
|
|
||||||
if (!outputMetadata.custom) {
|
if (!outputMetadata.custom) {
|
||||||
outputMetadata['custom'] = { 'attachments': { [filename]: { 'image/png': b64 } } };
|
outputMetadata['custom'] = { 'attachments': { [filename]: { 'image/png': b64 } } };
|
||||||
|
|
Loading…
Reference in a new issue