From 05f6a0d6de75f7181e94d78cf8b5836a2ffb74b1 Mon Sep 17 00:00:00 2001
From: TheArcaneBrony <myrainbowdash949@gmail.com>
Date: Sat, 27 Aug 2022 07:22:01 +0200
Subject: Fix merge conflicts

---
 scripts/build/compile_tsc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/build/compile_tsc.js')

diff --git a/scripts/build/compile_tsc.js b/scripts/build/compile_tsc.js
index 179707a3..e3bf8079 100644
--- a/scripts/build/compile_tsc.js
+++ b/scripts/build/compile_tsc.js
@@ -43,6 +43,6 @@ module.exports = function (config) {
 				error.stdout.replaceAll(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, "")
 			);
 		}
-		throw error;
+		if(config.throwOnError) throw error;
 	}
 };
-- 
cgit 1.5.1