merge(dev): Re-apply changes after conflict resolution

2026-04-27 18:16:45 -04:00
parent 20a22d2dd9
commit 7fe06cf565
35 changed files with 78 additions and 3561 deletions
--- a/backend/appsettings.json
+++ b/backend/appsettings.json
@@ -10,9 +10,7 @@
  "ConnectionStrings": {
    "ExtrudexDb": "Host=localhost;Port=5432;Database=extrudex;Username=extrudex;Password=changeme"
  },
-  "FilamentUsageSync": {
-    "PollingInterval": "00:05:00",
-    "RequestTimeout": "00:00:30",
-    "Enabled": true
+  "FilamentAlerts": {
+    "LowStockThresholdPercent": 20
  }
 }