From fce829524052d7795b879bb80e2dac617dd3605b 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 dbee451915a..5f1ea69a60d 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 bbc80378430010fb72ebeb8e92746846ebf832e7 Mon Sep 17 00:00:00 2001 From: Justin Chung <124807742+jshigetomi@users.noreply.github.com> Date: Mon, 28 Apr 2025 13:25:18 -0500 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 5f1ea69a60d..0989d86699c 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))