Fixed merge conflict

This commit is contained in:
n1474335 2017-10-04 22:54:24 +01:00
commit ef2ead262b
12 changed files with 5886 additions and 19 deletions

View file

@ -92,7 +92,7 @@ async function bake(data) {
} catch (err) {
self.postMessage({
action: "bakeError",
data: err.message.split(":").slice(1).join(":").slice(1) // Cut off worker blurb
data: err
});
}
}