From 2169f6dd892d4af6f95024152f9b6339aeb540c4 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Mon, 13 Jan 2025 19:13:45 -0500 Subject: [PATCH 1/2] Cherry-pick PR #24767 with conflicts for manual resolution --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index cb799b441fc..e661f9e847a 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -13,7 +13,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> af55292ca (Update `Microsoft.PowerShell.PSResourceGet` to `1.1.0` (#24767)) From fb26d1756a3bde895bd3bc5974e45f90206620f0 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 16 Apr 2025 12:14:55 -0700 Subject: [PATCH 2/2] Update src/Modules/PSGalleryModules.csproj --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index e661f9e847a..cb799b441fc 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -13,11 +13,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> af55292ca (Update `Microsoft.PowerShell.PSResourceGet` to `1.1.0` (#24767))