fixed mergeconflict

varianter · Nov 20, 2024 · 536717d · 536717d
2 parents 4049441 + a5b0333
commit 536717d
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/backend/Core/Agreements/Agreement.cs b/backend/Core/Agreements/Agreement.cs
@@ -9,11 +9,9 @@ public class Agreement
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     public int Id { get; set; }
     public string? Name { get; set; } = string.Empty;
-    // Foreign key to Customer
     public int? CustomerId { get; set; }
     public Customer? Customer { get; set; }
 
-    // Foreign key to Engagement
     public int? EngagementId { get; set; }
     public Engagement? Engagement { get; set; }
 
@@ -25,12 +23,12 @@ public class Agreement
     public DateTime? NextPriceAdjustmentDate { get; set; }
 
     public string? PriceAdjustmentIndex { get; set; }
-
     public string? Notes { get; set; } = string.Empty;
     public string? Options { get; set; } = string.Empty;
     public string? PriceAdjustmentProcess { get; set; } = string.Empty;
 }
 
+
     public class FileReference
     {
         public string FileName { get; set; } = string.Empty;