From 58b7e73ed4f9b347a24d024203eeff063194de6c Mon Sep 17 00:00:00 2001
From: DHCross <45954119+DHCross@users.noreply.github.com>
Date: Sat, 18 Oct 2025 15:27:46 -0500
Subject: [PATCH 1/2] Merge main into fix-mobile-download, resolve conflicts

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 873608af..0986e395 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
     "lexicon:lint": "node scripts/lexicon-lint.mjs"
   },
   "dependencies": {
-    "@google/generative-ai": "^0.24.1",
     "chart.js": "^4.5.0",
     "chartjs-plugin-annotation": "^3.1.0",
     "dompurify": "^3.2.7",

From 62908eabd951004e42561072e08bf5404cbcc63a Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Mon, 10 Nov 2025 19:31:45 -0600
Subject: [PATCH 2/2] Initial plan (#298)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>