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/Infrastructure/Data/ExtrudexDbContext.cs
+++ b/backend/Infrastructure/Data/ExtrudexDbContext.cs
@@ -23,7 +23,6 @@ public class ExtrudexDbContext : DbContext
    public DbSet<AmsUnit> AmsUnits => Set<AmsUnit>();
    public DbSet<AmsSlot> AmsSlots => Set<AmsSlot>();
    public DbSet<PrintJob> PrintJobs => Set<PrintJob>();
-    public DbSet<FilamentUsage> FilamentUsages => Set<FilamentUsage>();

    protected override void OnModelCreating(ModelBuilder modelBuilder)
    {