From 7f0dd1c08aed11ae8579f7de095e6f1407775a7c Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Fri, 8 Aug 2025 12:20:02 +0530 Subject: [PATCH] Sloved the rebase issue --- Marco.Pms.DataAccess/Data/ApplicationDbContext.cs | 2 -- Marco.Pms.Services/Program.cs | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs index f1a1700..f9695d1 100644 --- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs +++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs @@ -849,8 +849,6 @@ namespace Marco.Pms.DataAccess.Data ); - ); - modelBuilder.Entity().HasData( new CurrencyMaster { diff --git a/Marco.Pms.Services/Program.cs b/Marco.Pms.Services/Program.cs index a5c9ac8..4ca90bc 100644 --- a/Marco.Pms.Services/Program.cs +++ b/Marco.Pms.Services/Program.cs @@ -1,3 +1,4 @@ +using Marco.Pms.CacheHelper; using Marco.Pms.DataAccess.Data; using Marco.Pms.Helpers; using Marco.Pms.Helpers.CacheHelper;