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

2026-04-27 18:16:49 -04:00
parent 4a739cebe1
commit 73d8c7b45a
22 changed files with 94 additions and 1393 deletions
--- a/backend/appsettings.json
+++ b/backend/appsettings.json
@@ -9,10 +9,5 @@
  "AllowedHosts": "*",
  "ConnectionStrings": {
    "ExtrudexDb": "Host=localhost;Port=5432;Database=extrudex;Username=extrudex;Password=changeme"
-  },
-  "FilamentUsageSync": {
-    "PollingInterval": "00:05:00",
-    "RequestTimeout": "00:00:30",
-    "Enabled": true
  }
 }