- Fixed conflict

This commit is contained in:
mcndave authored and Dave Mc Nicoll committed 2026-10-19 19:54:02 +00:00
1 parent aa15850baa
commit 064d94d32a
1 file changed
+1 -1
+1 -1
View File
@@ -8,7 +8,7 @@ try {
new class($projectPath) extends %NAMESPACE%\Kernel {}; new class($projectPath) extends %NAMESPACE%\Kernel {};
} }
catch(\Throwable $t) { catch(\Throwable $t) {
echo sprintf("%s in <strong>%s</strong> <pre>%s</pre>", $t->getMessage(), $t->getFile() . ":" . $t->getLine(), getenv('DEBUG') ? $t->getTraceAsString() : ""); echo sprintf("%s<hr><small>%s:%d</small><br><pre>%s</pre>", $t->getMessage(), $t->getFile(), $t->getLine(), getenv('DEBUG') ? var_export($t->getTrace(), true) : "");
error_log($t->getMessage()); error_log($t->getMessage());
header("HTTP/1.1 500 Internal Server Error"); header("HTTP/1.1 500 Internal Server Error");
} }