From d38f50584ca29ba22efad4f0d7cdcd4a1e346360 Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Sun, 15 Mar 2026 03:21:52 +0330
Subject: [PATCH] fix: resolve version conflict for
 Foursat.CMSMicroservice.Protobuf package

---
 src/BackOffice/BackOffice.csproj | 4 ----
 src/BackOffice/NuGet.config      | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/src/BackOffice/BackOffice.csproj b/src/BackOffice/BackOffice.csproj
index 92208ca..b13cf35 100644
--- a/src/BackOffice/BackOffice.csproj
+++ b/src/BackOffice/BackOffice.csproj
@@ -138,11 +138,7 @@
     
     <!-- CMS Protobuf NuGet package (used for both local dev and Docker builds) -->
     <ItemGroup>
-<<<<<<< HEAD
         <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.191" />
-=======
-        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.192" />
->>>>>>> kub-stage
     </ItemGroup>
     
     <!-- ============================================================ -->
diff --git a/src/BackOffice/NuGet.config b/src/BackOffice/NuGet.config
index 37dfa7c..dea4acf 100644
--- a/src/BackOffice/NuGet.config
+++ b/src/BackOffice/NuGet.config
@@ -2,11 +2,8 @@
 <configuration>
   <packageSources>
     <clear />
-<<<<<<< HEAD
     <!-- Local packages (dev builds) -->
     <!-- <add key="Local" value="/home/masoud/Apps/project/FourSat/nupkg" /> -->
-=======
->>>>>>> kub-stage
     <!-- Nexus (hosts FourSat packages + proxies nuget.org) -->
     <add key="Nexus" value="http://194.5.195.53:32081/repository/nuget-all/index.json" allowInsecureConnections="true" />
   </packageSources>