From 0f1e86fab6ac6a45c88807229976539bd5316929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81ngel=20Montero=20Lamas?= <angel.montero1@gmail.com>
Date: Fri, 7 Jan 2022 18:26:34 +0100
Subject: [PATCH] Update main.js (#722)

---
 main.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main.js b/main.js
index b00c2918..99f4365a 100644
--- a/main.js
+++ b/main.js
@@ -783,7 +783,12 @@ async function generate(options) {
     const parsedError = parseError(error);
     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 = `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>`;
     $("#alert").dialog({
       resizable: false,