Fix Javascript merge issue and UI worker detail display bug (#8135)

* Fix previous merge issues in Javascript Signed-off-by: Alasdair Macmillan <aimmac23@gmail.com> * Fix issue where worker detail doesn't display without tasks --------- Signed-off-by: Alasdair Macmillan <aimmac23@gmail.com>
2026-01-27 18:56:28 +00:00
parent b1d63d0943
commit 41d079a316
3 changed files with 2 additions and 12 deletions
--- a/weed/admin/static/js/modal-alerts.js
+++ b/weed/admin/static/js/modal-alerts.js
@@ -7,7 +7,6 @@
 *   showConfirm('Delete this?', function() { });
 */

-<<<<<<< HEAD
 (function () {
    'use strict';