Обновление миграций после слияния

2025-09-15 09:53:19 +04:00
parent eddd69b1f3
commit 2d55282e3c
4 changed files with 1 additions and 4613 deletions
@@ -13,11 +13,7 @@ using Pf2eModel.Model.Enum;
 namespace Pf2eModel.Migrations
 {
    [DbContext(typeof(Pf2eDbContext))]
-<<<<<<<< HEAD:Pf2eModel/Migrations/20250912112500_1.Designer.cs
-    [Migration("20250912112500_1")]
-========
-    [Migration("20250914093120_1")]
->>>>>>>> origin/dev2:Pf2eModel/Migrations/20250914093120_1.Designer.cs
+    [Migration("20250915055059_1")]
    partial class _1
    {
        /// <inheritdoc />