From db7a1b7ef4ac3ba90c605ea0854ae9a4891fa1e1 Mon Sep 17 00:00:00 2001 From: KittenTM Date: Wed, 18 Mar 2026 21:16:04 +0100 Subject: [PATCH] fix merge conflict to complete PR #5 --- equipment/equipment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/equipment/equipment.js b/equipment/equipment.js index f42ffe1..5f7b61e 100644 --- a/equipment/equipment.js +++ b/equipment/equipment.js @@ -264,4 +264,4 @@ window.loadHeader(async function(headerContainer) { if (equipButton) equipButton.classList.add('active'); init(); -});w \ No newline at end of file +}); \ No newline at end of file