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

2026-04-27 18:16:47 -04:00
parent d3c1b929c5
commit e209c3891e
29 changed files with 784 additions and 1305 deletions
--- a/backend/appsettings.Development.json
+++ b/backend/appsettings.Development.json
@@ -8,10 +8,5 @@
  },
  "ConnectionStrings": {
    "ExtrudexDb": "Host=localhost;Port=5432;Database=extrudex_dev;Username=extrudex;Password=changeme"
-  },
-  "FilamentUsageSync": {
-    "PollingInterval": "00:01:00",
-    "RequestTimeout": "00:00:30",
-    "Enabled": true
  }
 }