backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-22 12:01:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update main.js (#722)

Browse source
This commit is contained in:
Ángel Montero Lamas 2022-01-07 18:26:34 +01:00 • committed by Peter
parent 3306ff2265
commit 0f1e86fab6
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
main.js
View file

@ -783,7 +783,12 @@ async function generate(options) {
const parsedError = parseError(error); const parsedError = parseError(error);
clearMainTip(); clearMainTip();
<<<<<<< HEAD
alertMessage.innerHTML = /* html */ `An error has occurred on map generation. Please retry. <br />If error is critical, clear the stored data and try again. alertMessage.innerHTML = /* html */ `An error has occurred on map generation. Please retry. <br />If error is critical, clear the stored data and try again.
=======
alertMessage.innerHTML = `An error has occurred on map generation. Please retry.
<br>If error is critical, clear the stored data and try again.
>>>>>>> ffb073fe (Update main.js (#722))
<p id="errorBox">${parsedError}</p>`; <p id="errorBox">${parsedError}</p>`;
$("#alert").dialog({ $("#alert").dialog({
resizable: false, resizable: false,