From fdc901964280022f10b17d304288bfd6566e4300 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 001/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 024de185d5ea06cf53609a2527a5bf6499668c66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 002/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c3bff5c56cf85ccc62b932c1a6b97b7306503c5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 003/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 4bd5c7f1ff0f1051c54ef2b90ac7e94f37970c0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 004/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 920ca24b439e146878bf837883b748d3b2bc9e0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 005/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 05e29a651e127f288fc7763293458b66074428b0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 006/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 812186553d7b1bfee68a77cca1671a05e1727769 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 007/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 48f6cee799476a360ca7416bd915d8b7504d3d26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 008/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 24ad4149ba6c1b7ff64a7ebea8f8a21001bad08d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 009/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a0ada31ffe16f0c189842b9c5100173ef5d352e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 010/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 4931f165b792f69d3a6d5eb3107b6f64cdb3495c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 011/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 90b7b76998a0a09b50c2a148d4346bd7737dbdb2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 012/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 92c68a47e7ea4fd9d057944a2b2ae13b78c4a5fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 013/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a586c964488dfd291c7db2b8344695ebdaa5dd45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 014/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4fe60d8a1f5ef4558981cb3e5988ad7b894794a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 015/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 1330bb9c94c737fa85c190fd2fc62e5af8e74268 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 016/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d632e169cc01a25aaf583635d537e677527a743c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 017/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b0703178c10d6d8198fc69a4357e3bbf578d4513 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 018/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 727dbd7dcef9001e8d959aef44da6a198bd862ea Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 019/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 7cc0c41b9186539bf5ad7746eb05db31dcc7f3a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 020/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 560206d639fe5cbf754451afb0cc297fb4277e5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 021/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e7686551bded024684fd6843d331ae8aae218c86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 022/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From cc8431d5cf9c39195180753c01c1afc1ce413d6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 023/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 88a8db566500e8c14be9281db2eb7727077c91c0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 024/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 17cf5216676ad372dc6a4ce399fb6f29676ed602 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 025/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a10e0e8076547acd4a619b5101a5f17ed78de744 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 026/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1200c920dd847f7467754c25ec568425e8eece65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 027/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From e017103a15291a6c9f562ba6e111b595addaa5e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 028/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 26cb40d68b3474394ee7ffb991ff5e65adefa30b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 029/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From f7dc928edef87ca4f8bb322e810cc3c726b00612 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 030/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 791475725e41023b67ab35100e249ef170225d9c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 031/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2198ac1a7e4d2c068c26851e98e9e5d04a41c0bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 032/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From bbf53a22cb5156373baf09d637c378d8e7cd3880 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 033/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 7fb0340fd324d8745f51f8e9e8cf93f269d25236 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 034/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From f9b5718d5959641812dce372885bda382254afed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 035/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4ae282f8fe53b61ad95e2e0aa4b0b486890a91d2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 036/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7c87130353b1011ddf3115c768aee7f54b2e2450 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 037/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c9953ccfeba873c0afe0caaee48ce9e961aaff77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 038/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4d03e0e537fc0cb4c9d3f50294301f76ce70159d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 039/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 3cd100a55556575bbb3e9a6a8d518418025e9cea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 040/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 67382388e6d6e5fe470f4ad49c3585d4f6670f78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 041/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From cae37311c85f567e5e7a410f252e083d61356eb0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 042/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f737938be43797f007cefee5ad03cf7f847ab604 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 043/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3d68f881f33597ff791da4b7bd02e40c47efc40c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 044/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 476c6b3fe10bc0c600931a535c2d4fc48ac65f19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 045/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 15eb84b5f54b824b4edf1537a14969aee2370298 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 046/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 2de8869a2b77585c79580a3e0e0e00ff62ec0f62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 047/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From f3a0a72376de7446dfb8a147a18860b5c7eac97d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 048/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 501c050dd3928bd13a35942dc2a69b713acea6d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 049/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5010afd46f7abdcaa7ccb110b849a3cc06327496 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 050/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ce9126e8add7473d88fc95fd0eb0723a6ddeaac5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 051/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From f71b1a416aa3f410ec73be612a9823d4cb960e2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 052/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From fa24a73642be03ec6ac0e22fc0f4899da6207add Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 053/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From ab3a1c6509a61d2d95904f2b463e6bb8c62036f5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 054/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cdd867151233f07620209acf2984bb88a0127c3f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 055/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 89456fcf35bc34577c0dc9f0ef0f87e7f1ea7745 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 056/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 145d683aad2d2a1253e4d0e18260bfffc214e782 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 057/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4ba461f2a11f47f19cba8e0f596245642690be1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 058/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 2c85d635b972637286f0e96653f13a848ca1d6d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 059/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 2b47796f1860ef299e8c078887c53c39efd04f8e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 060/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From bbe0f04d60b2fd1c9ac9505e239eaad1cfa40264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 061/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 637a9bf0843afd6c83a855a9b2ce37a30ead4f7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 062/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cffa761a8217167094e9009b8099561bbfcb8030 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 063/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 619c8cc79eada5b85f7deed4430d6041ed354c13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 064/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From fc272ff469efe55ba3c0c35a862fe7d0e0fd7a33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 065/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From dbce33e99832f30502cdb8d030b1c3edc7550b01 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 066/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3aa094e430ac1ba0c094b5d7e1695fea9e3a46d0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 067/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 62853aa1a4f5c877237310bed6677a25ccb1b005 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 068/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1c85c1297dff4c1c0870c8f36ad9ca339988fc6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 069/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9a858989d120ead4e55f00810101f1e3a7ef5f21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 070/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 323d2aef089de053c4a6c7b4d26f3a850c018ad3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 071/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From ce6b1079ea546db1aea595d55f6a2e457c77649c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 072/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 17e82b8c53aabb2c0c43839392b2e3df143033a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 073/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From fb7461ceee52a6de7e39973ef84f02540959f68e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 074/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 93970faa6c826ce15e10b2cf4fe1e56fe6709ecd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 075/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From ffa9f3293f1b0dfd590eeff3c0884c10d530502e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 076/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 609d3ee70c2d2d8f805b7c5c064626ebddd7e9db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 077/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 1b354608eab3b48a01d3e3a59ac4dddc8aeb5813 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 078/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c68e5af07db6a782f13a5f4e49c434a612cbc5e8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 079/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 684d1039a2f94efe41e725107cc197e7c7214f9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 080/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 61a23a4ee979552376d31d34188319d87be48946 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 081/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e8343750fd25c17df8549988af625914cc22e1cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 082/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 941f27befe40526051a7fcb32f6fcb3b6560c8a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 083/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 6ea38e587452e573bb2673f3e3bfbfc29c6e6cb6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 084/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From f620e8b8ca5df7c932c5e9d507b68e9cb23df7f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 085/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1364027d87a300aa51cdfc9bba629295e53c5fe2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 086/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ec0864c16cdef226c63b6431d6dd8538ce3b3882 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 087/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 56c971df7a97836c2dfb4242c603aadcf0c3a029 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 088/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3c0385c8a3ad143fd1df21eb7a99b022639853fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 089/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 45ab32a123b2d1fd3593e380f0c1e4bb0dede53d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 090/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From bd9f37785087c28caddc5874560ecab07c33d11e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 091/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3570f09bdb2714b48e696a90235bbb3f0cc13fad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 092/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 35590365f0a84b05fd4fda2d010317e7ef5f42be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 093/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d580690758cd8ab3457891ae51ddfae413fb310b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 094/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 0aa1adf61a1667d227a99a82f5e2e3e50ffaf939 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 095/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 48c2f7e198dbfd26d8f8d0a707d8ac47451dbdb3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 096/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 92b2d38b19ea9623f8dc570cb89b4f24cc1c54f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 097/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 6288e5fbd3088c14b9847cbe78c84edff6e4f8bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 098/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4f97cec6b8865e21f232d38533f8d070eda61e6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 099/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 798a665ddb8375fcc446cc4d908684eaccca7cc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 100/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 86a1356700e0a17638ca1d87db4029782f6b4d59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 101/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 1c4cd56413d68573ac4f10b8c1e5fc60ecc99730 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 102/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e5cf33c9e285612de2daed7b4984082115484807 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 103/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d0d2151062b40320dcae4edc0fb4369308d5722c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 104/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5b4a2e55c322834d815e0f525d942fedb5966589 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 105/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f0626c04a600e3e8010005d0ea90978395f98995 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 106/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From c0f43a7b4e217bdcd726e9c08c6657ea1627d060 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 107/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 5cc7bd5bd47c4a4b954d6148ccabb78176e583b0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 108/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 963618326f2b1e5fc60448392fa390d3f8e77ebf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 109/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e41dab7f42f66efc102dc3a9f9b51544655a0314 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 110/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1ee77924d4c174f29f36d895894858be2d098f14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 111/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From bd8692e04322ed11f15e54782051c786a6dbf744 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 112/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From aff9caf1ea2f80e67accf83d0f3d33b04617863a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 113/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From c5f1a1dc7091133d752790afbe06e8644e851674 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 114/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2ec653471a55a6aa846a47ef3659ec2b1e733a9e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 115/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3c4686c0b25cd03f328220d1fe07a8efb29312c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 116/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 48c53ca933786dd35e346714fbf2729713d0fdb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 117/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 74391bafde52f1e071c715a8ee58c82d5691e040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 118/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 0f7c650e08a9b0877d268cfa8abadd7c96a07a84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 119/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From e62870a5a60da9bc65b2721406379341c0adce96 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 120/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 88bbaeecb2c8a28cbb45f7124a95fc4341608e93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 121/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9a04a1a60113bc6c1be6558fe8b0d37fccd0bb5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 122/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0aa904208eee6029db371c73acf08e4f0903283d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 123/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 51cfb856b39a1b724c9c5cfa27cf3da74f953396 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 124/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 811a475dae767b944a88b16bf4dfc83b582a029b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 125/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b6f2f0f377398d30007998ee7e802bc73776380a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 126/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c5d8d6aef802dcc57ab94619bceeb5c6ee029ebb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 127/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From fb30d262f48d25bac2db0d86e9d4f9b5f3eab484 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 128/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8c396b8f10c8adc23877aa6b10e65fe5ea7dd261 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 129/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e4fb30532f3f116e3af6459a668036a3f2cc2e30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 130/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 087871f768c983ac3cc5502d21742952e9476a01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 131/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 19efcd3c72d8b77aa55b7c436a31abfff0dc0396 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 132/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d4b846d6bd1f1b8da12b019b7aaee986ee614dbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 133/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 47115eb18edb31e5df525f79a1c3ef4d0445eacd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 134/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From b5210e62b3eaa5c81cc67bffc08b6cb309e7783d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 135/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From dc83b3794029a96ce326f990d385bfa0d9d057e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 136/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b04633975ef5f47be305cfdbe6e4b05a4843d174 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 137/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b10da79c443ff8808930bd631939885a45281bcd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 138/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 46d209c18f08f7645358ef9d0343d855830f1952 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 139/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 070a3034fbdde491b011e7a218fafedfba2d8fb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 140/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9a3f0da1d8265a1023e5fb77669adf69b7bba1ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 141/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 99f536cc5243e17cb1d179673f051311d27484ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 142/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 5c04c322d4cd80a2d8e5a9a17648992b37283eae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 143/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From bba3842b0c13339636e3d97be270535cc3c2f7f5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 144/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d8993346939a1117e33fe33a97b965baf37b8a9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 145/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 29acb603a960efa0a32e4b97a9a87c3ec5c956c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 146/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1327d657bd7a82b7a4261208b7ff26bace00d0d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 147/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 7a1dfa4320df2f2ab607444071ef7a34367d2897 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 148/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4d73ee47cef0b3f069404c06f07bb8aca0f33692 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 149/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 772ecb8a266b9857a28142dfa06888080d7f66f5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 150/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f25c439687a609fbc3c8224cc3a6c73660e66142 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 151/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ccc48b5d54b3b35358c531d41dc77d6e595508a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 152/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4e0c880223f4491241c3d5d6dd8c2d23b3ad36fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 153/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a792ddbc80927d6f1db1e7a24a1b56ccc4ea8821 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 154/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From c72e8fc59b5bad4c6eaf358c8fe3f7bf6a13c119 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 155/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 14edc979180ccc4060b7ddb6092a060fcc90e10f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 156/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From eeb5956ac30a3ae7a39c6ec9dfa43a7f74410514 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 157/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 90081296280a5f6052707c30aaaa58465b299472 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 158/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e785f1958dd89eec7b816ce08e6c7e3fc5311eae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 159/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 933bab7622fe849613208a9b090c430aeb701c8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 160/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 736d4ad1512d71ae2231ca2f1286cf8415ef67a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 161/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 899403ef652f93d2327fbaa110cc56b89fd60aec Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 162/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c39f82a2a45c99afe34b2ae60c1ca0442a6202fe Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 163/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4e91af1fcb89d347b38c5989c8214010b6a36e85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 164/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From fcf74959fda523492d0fc962129faa126add75f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 165/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2caa8b377bc931d3e7712e86855b9b13150bc506 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 166/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 3bf37c42c71e7d20ada46c031172d67806952c95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 167/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7d274de42b4df143e77ce2860c5eb16d08ab33af Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 168/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 169118f140e12d0df4273e2f864564e3eebca2ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 169/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3dddeb20369922ac5bc28bc054e62acd861c69b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 170/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c902b6cda025013948413ad9460914f9a0f698a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 171/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From e33bd937341ab5388412cbf97ddf2d0618cfeab6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 172/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0667b1b56debf4e0c5f6dd0f3b0dd324d0d2c18a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 173/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 75f9ae82b8dd466269c385c09c2b9f0fea49d134 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 174/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cd337ab6bc852873b805e07328165401e626fac5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 175/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cf986d8f555965e1b270bb7d3ed147b811a7bbad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 176/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From b29bbda3c614bd0034dcbd198cdd1258ccf5f1fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 177/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 01edec31bd5fd2ce41b2cc0e02992b046b79c38d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 178/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 5ad1853b27cdbd884fae2279d69503d617f4d1df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 179/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3b7383e497b788469ac33e0274ae321bddcef0c0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 180/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 5ebbcdcce1aa768615ec4868154ce9cfb22f9b22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 181/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e9821180542c31eafd0376064bb2ba32ea3a5618 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 182/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 486cd4d1708b24741ee3d0bac5f0514f7376f762 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 183/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 52dba05d3734280c421177332c0a7a85b31dded6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 184/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 160a141cf61e1688647dd9042ab279256bb91e74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 185/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 65c525a3a3e5cc4c5d893472cbb00aa3f5bbed6e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 186/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 11dab3594c37e272eb8f15d651ef48d57531c7ab Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 187/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 110ccf3573ee1a54347e6f0ae69cb05b95013635 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 188/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From dcb3ae2bd1336eb180c1a9f45ffbdb505755c5a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 189/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 92750f01981cca82c0243f8ffe8a04aea90701de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 190/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From ef20df5dfad5b330fe3ab7e80f930362fb242982 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 191/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7cb7fde7498af4eea9fdd08a4c714f5dc3c81e55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 192/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d52bdbf3089e8fed31e425421b2250ada7f0261b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 193/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From eaa9a05183e96c9d447d568c47b7d19cd621d063 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 194/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c1869ad1910604928a0cff9eeba41f97f79f5898 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 195/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From df4ebb67326512e1ebb4568740b1a2c5e3505cbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 196/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4efcd19ba12bcaaca77ec2021ef459ad5e6a719a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 197/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3b0d6e1880d3638b721801be38d78656c18cdeff Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 198/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 67929390e923c78f39996f70cb5408746a79cf79 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 199/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 94ce07ee4709019042507c5118808982ecd20810 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 200/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 26766fef7294ca4060fb40e3d14b58ea6cb1e949 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 201/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4300184326027b9e687443868e009e40806c09b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 202/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From f2bfaed1b7f9b545103a406275e262361ccfb0b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 203/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7dfed6fbf2824a2a4cce2e9b616ef0a5943d0384 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 204/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 638d91331c08332c7e19e73607f40b8e2d064d75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 205/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4a6cf0dd213138a6bb7da9de2fa08da2d017e2d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 206/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From b81210b6096aeb12fa22ace8a3fe475d0176208e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 207/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From b84ff97ea3cf7b6fff0988279a6c3c772ccb6a1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 208/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 6368d2502db3b0724f7315849fdb4fd93b6f16bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 209/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 11181def66dff365f1ecd52313896114c93bc84c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 210/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4ee72243e766e590d2bdb6936023477c4ea71a8a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 211/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 547ff4ceb2c06519e17e1621c8cd078aa849ae69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 212/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cfea211732ca5b1d45951d8acdba8b439268db4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 213/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From df821f23e9e6294b59e01bd7e6c314299d03146c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 214/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From e89e780e0b3c812160773ec93224a6c57b722c10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 215/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3dd6da16750cdcc2f9b580048a50b9bc2a9ed35a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 216/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 9acbdd93c3e29c5cd4f646bcad25d5711ec9b1ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 217/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3df36fc5f9a22545ffc949742383192cb5d035ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 218/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ca5aca3abc85f05b65622b437585b001363b2c31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 219/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 39fb05e3555da720e47e259d31622575848f712c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 220/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From c3fdbd38026fa388edb6bd7ee72f9d5483f23651 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 221/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 41b5358190b3476a200b54e68f10008bc2ac0555 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 222/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 820438e85f67261b0623b828582046bd2a15efbb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 223/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 734301a5b3bbb9f322e4f2121c8dd525fbaf9ea0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 224/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c0834fd5e205e549150e4212098e889606410ffd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 225/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1843ff0441779baaf07158f9d48b52e7e203c0e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 226/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From e72c7684cfe312412e8849cfd7312fe11b052303 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 227/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 62dced42e124931108eb8f09c917c423d1403283 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 228/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From bf38495f4005af4316690c8f9d38c47d0803ad20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 229/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From efe3defb469ad7740fdd021531eac5457186c00a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 230/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From eab9702c56ac0a8bc0c70695fe99344827d2b180 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 231/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 745b5be6c81a8d03ae29da3d12dba4ca1afea86e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 232/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 94355c07942a06539d7cdde02371a8409dc12bbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 233/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b222a5f037a3a2d1686a35d72db30a98cd433305 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 234/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 45bbe420fb1c0f1dd88a56550b47dc5475727b90 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 235/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 88b0dff20b24aea01ccf0f5d51c99b9070ffe409 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 236/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 064db76f039c4604efaf4b2fca314fe41450ae1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 237/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From be2e7d38d9d27ec62c57616dc537f9f13a512b07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 238/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From e73a321745299875f4fdf80baf8aaa54a502d50f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 239/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4b93d7ecc80e191d6b089e7ac73a34b1eea59966 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 240/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 66d4c370004c7647d0cfcc4f6a64366e97f28953 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 241/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d7b75b13ebdf827bf2b644a2ab32dec9886851c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 242/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3296d7a4b2335e64147f3a41d28334f1f388f34d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 243/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 9bce26e2286298d431e571a62c112e99147d852c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 244/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7b5c34f117512299b2772b4ef99bb5b96e9e51a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 245/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 514d72924405cf2143b1b67e6595c742ff89f6c0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 246/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 66776ff5e63976b6d0fbe04855371b9bb133591f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 247/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d5c9495e49b3cf0e65b215603fe79749cb2b8a0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 248/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d484667a5910e623e9c19bacbc5c8680d340a073 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 249/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e0c6644603b3f710db1c2f3a72143dff09c6f01b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 250/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From af38be2b58f5f6fe6294d7b26560dbbb2fd5408d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 251/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From ec4ec0473aeb5bf1d2c7c317f4224a250b1f5fec Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 252/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 41dd99550adc525b5c8be709efdf40143d43c9d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 253/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d69078b18d6a52aef79950241d6755a67840f44f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 254/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 578e4f242706cc5c3265ed547132dd76f799723d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 255/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From bce24d074675d157dbc4572fec50140c5c363da1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 256/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 093d2fe90f801828fe0c821fe379a3b6815c7a14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 257/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 32973859a01dff29b78dbddc13bda347513d30d6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 258/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 09bc706a23673b1f660bef5ef56e85fbc53222fa Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 259/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ae029bebd21e05c57fcf7aa318649342f9e982c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 260/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8cb080c592e41a36a08923bd529b5efdbd6bc661 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 261/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f0b2f06ad429db259f8abd9e196a1928c087d3ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 262/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From acd9d4643154ae15da17db1c8c6fe9b27f9aa766 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 263/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From de8d0385150559fe6633db8286f407b6c104d501 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 264/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From baf3bf891c41b68018b6af2ceaf5f1c0a926bbf7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 265/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 36938055a6379850cb92a1ca9aaa988c15b04a28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 266/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 7b9f34f55786a89ebc07e250e494658b888db541 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 267/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 54fc0eb394d6848ee116fe63289e68741e77eb11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 268/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 9fe2cd292449fccaf2ea8ef49c79bb9656ba008c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 269/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 5e6ecd047dd040fa2275f958292acd439acc6cc0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 270/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 81ba940a48bd0877a75dca6884de09b885f4837a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 271/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 344f53d8bbb4de0ff062b2189e2eb1f03b2ce5fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 272/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 80a854e8f8d6c813dc5660c11b50801134d23fe8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 273/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1ba28add542eea1f94c023d3c572452c413906c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 274/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 1ea6a38c05aa3c15e06d3922f23467cfc4e58872 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 275/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 206fb0da9197cac72dff6a367ccdc24d827eb8d6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 276/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 28437b9fd2cda35c77870e54098381753983b463 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 277/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1cd75dc1a6c8a3bd2476557ace2deddd93650bcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 278/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a95f9658446b5ca30339abd5eed16a975101785f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 279/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 344c42abadb00e9913b08cf613f028646e4176ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 280/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4542d9e0e319c9875b7941d10ec25aa13a555b2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 281/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From e02934faa6c4f638a69ab7e039357380109b7895 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 282/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From fcd7284de8281ff19616a6c4ffaadd8013061713 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 283/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 96262c6c5f63cb1642df940d49105afacdb4af3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 284/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 42e9d83b31e8b67cbd254a1b7a22f0b95fd54ba3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 285/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 92616143abbb3698f2f819807217f36da66b5e34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 286/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From ce8faad6c5dd1e6b37f19666a3a53178330a0601 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 287/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From cbd61bd0f387f54f7deb368ac3487f41c45ba30a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 288/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From f68d2c1ccb41d255396feca680ac2022fa759ae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 289/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 246202bb7f4bc7ef9726b5127b11f4a3670bdceb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 290/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9e368595fccc64c1c43b7dee4b9fc98a5723f232 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 291/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 12730d788731ccfcecf0250212c4b7338441b77f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 292/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0d173fb0b8de35aa559f6e24e41c2c2fdc442ce4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 293/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3b69e380ae1eda570a8991309d72d77eddeeba54 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 294/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4bc1fdf473d387be4dfee72a0e21fcee09ac1028 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 295/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cec654235d5fad40d490f0857bdd5aa8c1c00eed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 296/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c33ee26cb5de72e6beae06930bb567c94997fdd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 297/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 142e56daa4f4ff4a77a780aad9263121c2428160 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 298/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From c942c6174b816df02ec2c4dd847ebfb51ea78bb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 299/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 80f28e42866017578d514f22781bccfed02ca260 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 300/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3161b3edafcdd05fc6e1d5a37d230bd6bcbd44df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 301/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d8caaebcfe56780097223eb7dcf809fe8603cc21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 302/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 739d189c81ddbcd85a1fee7f2ce393b61e14289b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 303/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From cbea6e1d74a1a174f654562e4916ceca6485544f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 304/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 1c54d451ad47f392543d75ff83b50e437c3a3ca7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 305/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 21d095688ba3aa0a0a1df5d62e09529cc3777bf4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 306/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4d358bece6ffafd6b6cca3fc06270d06f7c350dd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 307/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 580bc31258d520c51e938acf324042804c7df10d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 308/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4e7fe58b16003aa8bf96ff874dfdb0df85512a2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 309/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From bda6e6efb94701059c92dcb3bcd699b4ae4bdf9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 310/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 551b92637ff613fa760ad813208e9dc72a4fb573 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 311/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From c250834059a981e23f41c098b84a090985338c7f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 312/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3c76cbd718e0014ca8c75a03939bc8a18447bf0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 313/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 332795070e468eedc49594a3b2fdc16fe17b34c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 314/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a4e026989b085578d71f26295c1a6d664cba68bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 315/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 36ee8603491c574e56f037c6da29ad763cc58545 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 316/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 124d2f88aef61af1139a3cc60eb32eea10aad917 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 317/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 91f8d8dcc5b13d31dff725e0fdd6b527d34e351a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 318/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d736911687105c21a4a7791bbd48a1b17c457410 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 319/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1591b2a1324571d81e6a280b449100ffce1e8291 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 320/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e15a7938af7449770bd39b1f6a3363aef1df042d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 321/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From eff2b1b3c818f8bf712ddccd07f76bf991881c75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 322/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 83ab8af44c40a8905038cf83d785d8187ba202a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 323/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4a1e44ba8298924838a82b40082e0b170d48d80c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 324/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 9fea9554bd399c255bd0fc39a2d6fd8aa18f80fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 325/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4b45ceff9f1da23dd67eb86ed2114e12b20b13d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 326/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From bafaaa4ec2de939a4c74642e05d8037dbbbb95d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 327/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 77492e00dc50c3bc5f224ebdd64d0d28e8f39d63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 328/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 9a06b7fd0f747b2dd11b9dcc7597a0492232a06b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 329/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d9d5fc0d99b3067781a33787b420d861b4a5ab1a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 330/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From bc61240f4a5dcda798a5b3b4b6306b52a4f50b32 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 331/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 071862c939cc2f82b3abd02a6e08882acf63aef2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 332/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1daf063f0b8ebcf63a526d5e988a7673a01a3dd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 333/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c3daf56d69e7d705aca315e916bb7e254165bd8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 334/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 40fa238988c4a0fda9cbc7f2fdbec63cd57b8772 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 335/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From e65610762b011999058129e0b2da2cfa848df551 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 336/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d0336943b31e80680230f090c93a92b6449648bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 337/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 65b7efdf95fa3001be9bf697e8cad5e1658c8226 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 338/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From b6199ec495e6c42c9ebf65ee4d50210a468e5634 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 339/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 5bbcb45dd8008315434a2408447283ebbeb33c57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 340/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 302f07dccce871351f8669df88c960d689a2d561 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 341/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 149c0aa96b05393e34c3795e33436538a8246b49 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 342/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 6aba70e8a88b898cb41605f159845037721e9f93 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 343/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 6f991788681d4728e7d393d2b0c95968d58a7fda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 344/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a6afe9d147b5b4046a291292b64a97039af0ab8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 345/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ae360a5825e1eadbc2dba4e6d40f1091dc895efe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 346/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 1a9f01753540d2c29f6df3e62545614ddfd7370b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 347/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3308517fb76ed2c8b9b93572050abd1af45c1585 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 348/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 5ef5020374782451c1547b577541e8da168ecfc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 349/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ecab30dc44dd64d58170c88d9cf7b034eb4a4af3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 350/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 766c3fb4783d77629a04b9bbbbf03b1ff29715cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 351/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From b3dc8b83ad7d137e40fa628d5e56f3bc6d0844ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 352/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 6889482adabdfaf6b3d0d8f8cd2eadf1cb0cb203 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 353/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 9c1f13a1e97c9bef6ea7087da5382d4afd99e1ef Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 354/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 61c091e611006ca39166af23fa7bcc1e5c9bceac Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 355/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5cf8bbe688a8f83a0c4e8a8e4bdc4504c685f959 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 356/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 60e8913066ff5437eefae9955680ae42424d8b41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 357/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 227a3443a0909e671294808a39ba0d5efd4fb247 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 358/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 02be2f2a2193e1003cb19f4030760a05f359b630 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 359/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 5d1f844da120ec89f05383b0a5282d28a8b825ed Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 360/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From dd8bd69b54e1fddd961cbc8d158f0eb9a6974309 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 361/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 7201aa37f680884a5aaeb18e768f979675bbd1af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 362/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9cdd27a3afcff650af3780a8eec55c09b25f49c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 363/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 0b787a5cb385e7cc26956cefa6c204c59c4e379f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 364/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 95df4feff5842f84cac191a62d073609d03eb10c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 365/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 1a15fd85daad4d85b461210f405e25265a69b482 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 366/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 85af9c2cf0ef8b2e75e3de04307ebeb01a883e67 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 367/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 00b81f0d4d903557e85f5c3f76c8ee1b01ae6fac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 368/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 07ff65a3e4fac1be38b8e94f76420e995d7acd62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 369/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From be591ef8b4dc57b53806be7485951dc74983f39f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 370/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From bccbcabd28e05c5fa24ee007ac087b0666031e13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 371/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 51530da8bffa5703b084d29c846510349db7ff1f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 372/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 47c4549957ee1a735f1e2017efafb58d59e87cc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 373/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f2dfb0d052f5836d681a299e0f249ba87e61ebd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 374/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From af19abb1fb15c34afc8605c654047c07cb824af2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 375/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 8553c21ca44b08575654af41a5bacec8e12d38b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 376/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 42fc19e4c19631a55eadc4d492a0581036b79adc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 377/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 8e51b6994c34804412ce733defdd85becb418643 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 378/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3b3b9ab9c8f99b75b7865fd4156e5652ae031bbc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 379/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d8f8043301c7659a5969649bb93b875f1c7ffdd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 380/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 56f9f8ddc4c4f34c36e8ef463ff19a4a3bb5a143 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 381/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c84355267398a857eefc4223f938721bca038db3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 382/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 70047fa8c0316cb5aa7fbefdc6fe22c37c10560d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 383/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 1e5561e772dc2fe8777c2306a69d31f530aba354 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 384/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7bf40aebc00981b99db30335b8858121e6be8c30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 385/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3df88c5a9191c0e36123c15cb7bde5ce35540a1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 386/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1be7c9153378277faf17b3746d06353225581087 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 387/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From d3655064fa6dfe76b28874da57ef2b4e8ebc76db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 388/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0d49ad5e1a7231f1d7604eb79e01d2b5b4731d4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 389/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d7c98a8006c2b091dc8d31d30635c23d9583c49d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 390/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4b772bb52aa05171b8878ac26fe5bc063e9c2138 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 391/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0020e5cf2dfdc74f1e409c66b712c96f364b5026 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 392/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f468a21509b9149351d4a3a38d4b702d17c10e9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 393/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 90cb98f7f0a5cce0ea0be8d09a147258d5e5bcd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 394/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 709811d5f0f2906179d096d83678f2f49a7c24da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 395/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3c1ed9e8167e1b2291f25f299dfb5d089529800c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 396/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 6b1d5fd4d6f6b48958592eb27a76136c75f632df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 397/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3fb6bde2314e6903643833c40dfd9be66bb5d022 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 398/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2180fd32179bdbaec30195c1c4941645f2d91728 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 399/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 6d41f858518628780f95f53dbe18be616e4e9400 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 400/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 2da100548f3cf3b4344c76597461a357394e6f1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 401/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7d69b4d50315d105c483235ee47a8f346f8ed96f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 402/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d2620f50040b7a13734d98bc33b5d0b6b4e762e1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 403/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From be0a5fa1efdd76fcb90cb85cbf7dec80d74562ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 404/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 244bf7d1d7edc688995c2970f4c2b6f04433e969 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 405/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0c6af96636e41d5c0cc5afebdad78ebd8c750ee3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 406/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 2e3993f35dceaeaf6c56de7729f4f3f4f6434651 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 407/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 733159ff4e7fd5c83781ee7b2cd14a5ba384b8d1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 408/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 132cf1c00c25a2dbac7a2a282f0993906b6962e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 409/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a4b98c545caa649e831cc063491e05e4b797a043 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 410/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 67aaf950ff2001282e770c13f3b2eca91deb93c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 411/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From c5e370e3fd0791750eff74ccbbc47aea5ce7c762 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 412/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 86b43a4cb310db5b525b8eba710f5386c9b352e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 413/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b5d7c8ef995981fa36ea546d5a7497a70e88528c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 414/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4cb8c5625fa0a0c0931412dbe21d26fb0bf08841 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 415/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8d331606b381cb0684c3a54197111f2087af34d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 416/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From b190bc4f9aaa711179900f077a020854d7bd0032 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 417/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ae5a390091bbfceaca0b1f35daf391af294335cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 418/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From b1a581a554545145d5923e53fe0f0d9029ec2e61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 419/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0c500f7e35375dd2d9c9a76caa1f2f78660e56e4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 420/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 16d1522e1b1e2a2b9bc39d16726501213b32db5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 421/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c1fe337c14be3442dcd389eb48cdf31e7df10176 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 422/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 22654c84d3b7d1644f68f3b9b98ebbd557098ac8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 423/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 5540af353f97b742f4f521141d6fe34de63f82d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 424/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7ac2e159a11c9601091640eec6824ec3e6312b77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 425/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 1669dadef0fd291558076405753d4d3af68d7dc6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 426/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8212619a448023b4cbc4a093190f37283916b700 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 427/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From dd763468420f1dc4df80c20abbaee49b8ed4e7fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 428/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 022c80701a159ff5dd22e15fa11a04dae27d9084 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 429/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 13a18c3413ecfecd2c618b028502059a7da875d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 430/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From dd2af5619d86796e68544fa3a62f1caec96b15a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 431/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From a271351dc087d18f439e227420b43d6aff7538b2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 432/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 752371089f8b795b6d33b98e89e40c4fd66589c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 433/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e5178f98c365247d61cfe6edccc693cb3059f010 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 434/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 7f05ed116db2dd332fa7ee7413fa81dc6b4a7769 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 435/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 98144c82df8e463b861684f184d1ac916aaf73b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 436/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b92d46fe599cf6e05c0e82eaf419402e1826093e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 437/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 143ebb5ab9870129e9a8c6df483c78acf8b15b97 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 438/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2c515edff19c84f9ce3336c7fb43c031f6175fed Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 439/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 76591943f1170052d606d4cc9d476945365d84f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 440/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 889ea7177bc59d88b39eadc6beef7c8a6e0a6d33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 441/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0bef448e4fa1d90ecca55d7738ca25ae5e9f00ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 442/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From b1a4cf74b7a981e7bd30e874cd5d4dc98b14c007 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 443/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 59ef9a78fbb19b3d3d3fd2155b69b11b411cfd14 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 444/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 6c23f1a5d69b3e5723d236d68897bfd49bfcbcb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 445/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 27239948befb542caff3baece35081b8a2b41be9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 446/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8e1bd582fea9d004a89c557bccd7fd2580015c09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 447/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From ea90a8994e00e39c998ba85c6c655bb3c92c5cc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 448/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 9c961c1753a5f04f72c55206d0939f5e508ad2fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 449/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From eabea533484725616bbcbfc7726f8f1a89ee50a9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 450/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0e8067d0ad955dd3b4af9dc0ebc633bc1235b1da Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 451/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 53167a5f2126f2406924769b97a7f2078322c2ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 452/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 7137532c9c1952e64c3021f661bb92f71cc8a3da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 453/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0edf6985e09fe63298a27852b826688bc15a3b38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 454/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 8c685ec04c68b29318f66c7fb81bfe468bb75e5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 455/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 926ea4ff71c7f3835da4e50281bf0f56348306e7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 456/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 105ce7903f7c667e94e1375e7c41a6d80bc4c562 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 457/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3346de37bc3c9fe43995483cb0c5cfd5ff7b84f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 458/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9954e08930c32f36c71d950a8dd9adb015b09ade Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 459/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 2d64b7de85b9e5490f7a18b8b3f957ff60299581 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 460/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 8396e8205cef851548e46e08d51296cd6fec02a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 461/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 25d4f8608f0044fe630217a214985213fe0e30d3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 462/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3b92a6330b5d5a7adbd33ddaf50d1a38c25d50e4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 463/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 441a916175e085a9bbca46659032458f2f7fb6df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 464/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3d7d3059ec6d69e4c87a24af745556c3f9f73a2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 465/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5aea0ca4a982ffac90828350102f3ccbf752801a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 466/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 737f0aa88345137bdbe6889a7a1d476786169e5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 467/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3b0b68706eefc6470473f8deecfa063ea802410b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 468/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4d2bfb2986bb719ecd748df45181f8fe52c943b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 469/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cdd01a52da567a1da570444b3b011f4471289a13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 470/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a6c4ba785af74b3b3759ab0e0560a9eb798606a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 471/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From dadde9b015ded00910fe8cc4ba9eb30dfc80346b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 472/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From e2a55be653d95cd9253ff8cdba089a3e7d5fcd4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 473/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From cf004a1a93ad764d7a320966fba18c7ba0f62657 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 474/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9096712305fb32b111aac2e790c2616a1d0d588d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 475/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 7e8751bd35eab6c8999affd55fb22bb871e8c3c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 476/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 95fb2ab2bbed1928271311463180b78dd71575d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 477/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cb7ee599f34c3be913f405f210420d499c1f3915 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 478/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 9be2ae63afa9d28c161f81fd7109b048ced18afb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 479/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 2d3b4dc75aee6fac45395d56ffee5ac90e980035 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 480/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 12bc6dd0ec3f5c0b05985bd83c84bb40de68b43b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 481/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From eaba1a11228273eca15b4460ea76f669ed5a051d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 482/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ea8309d84abd7f0b34082f287dc59845e9d7c60c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 483/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From fb5a9b09f1578c03e182da07acf398a85affb5a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 484/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From c782e357bdd76036aaf59c47c2c720c7da199441 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 485/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 2bcb335ee5bfce233613224ec06cd5be5bbb3a4a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 486/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 30130829378a6b096109df34eb3a6b5cb22b7f17 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 487/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2cba8178228290b22c8c70a98dbaadd1ea8a819e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 488/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0b9df054eaf45f123e4eac3152ac1cbee710a3d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 489/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2902f8d633708a018c842368f2418b82aabba198 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 490/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 85b5fd432bc52ace2860d38a15eaba452c3bdc87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 491/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From cd199e1d9d8b0e7fb7883c6f8a6d308b910a961c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 492/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 295b0f057e083961b98281ceb4b7d8337666d058 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 493/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3578c7080ed4a78f21181b2595ee37e4018697c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 494/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 728b3737ea92d454463a504b218d26ddcfeeb1e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 495/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From eeef1135d0b9ce0f53e3ff0bb5d19224b0a967cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 496/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 32335637ca5c65fe2fa257079377b088fe818aee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 497/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 724dcbf1187cd0d683a972224274570d40ee9151 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 498/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 52b81666e26f20392a1eb47981eed28bba684580 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 499/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c59e50b45aa6195c26e8d170bdbbc23bf387ceae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 500/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0d6add269723e75e7b6df9aeefdb35f3e0e84e20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 501/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9350871bc99e3134ea710f98b9b1c26d44503211 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 502/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 1f3eab40f99c2e574ba63a73eeca456d45f14bc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 503/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 1ad9243f9d34f16ed0ef4abad58583a45fd098f8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 504/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4c2e7d53833fe70f8e9fb29da4264e1f2fdfb62e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 505/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a7a6427a8ca1167b99c00959dbcf7fbb1029634a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 506/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f6d5955537b7642b1d21ba2b70e292f10a16522b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 507/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From fe49f9d55ccfabe4d15f79f9b4275a6fa8fc108d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 508/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b3a845e5449e6396bd971592b6321492b0588b54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 509/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 84c292f0b1c72e8c270b8019aecccd73e62d29d6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 510/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 6bfd05e2825a9f1909b953d49125b775d344ef1a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 511/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0cb0959e4f3c5ab826289be2ec5ae47968465390 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 512/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8f54703c4bfb25731dbd56167b13db01466b82fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 513/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 7c418eff88c56e316357f27a9061e401260c8028 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 514/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 7fbd64c59c27bcaa38f5a0fa51f58f579a227bcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 515/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From efbdf532f85f3bcf7902a221faccbba9313723eb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 516/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 9efe17cf6f9010b733048ba3ead5404f1f402bd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 517/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 46fcf4ec5f505269d113877aa4ca4c7c87f36d9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 518/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d109680eb63dd9eee316807534b8a498214914b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 519/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 544e96974357d1c35fd2abcc5f6ce8f1819ee834 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 520/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 92bc5431daca43d72aa86fe3eedba4225a702d9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 521/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 24d0b855e1efe0c483920cfad1069ac38fa3ef49 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 522/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 07ff213fccdcb2941e09380fa06a29c44d322983 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 523/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 6ce5ed7de7be11a5ad38b60f5fc9cb3c36941058 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 524/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3d0011a96e2c2c41ba5c7f127698a251f2bcb044 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 525/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e1eacd36d6ab4d2148469087ddfaa584492a3a26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 526/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 8d5e6a26fbf7e62ab99569cbf2b195589028a0bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 527/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 6bad209bdc09332b1b60d99be357dd4fd4263f80 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 528/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 1e2a9715526905a6cce644c8c92439c4b255049f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 529/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 68c9c118486ae16695331dded305137cfd61bfa2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 530/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f1a8fd5a45bcef8792738659950dc6f557bffc4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 531/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 02047b221abb6bf2c31d7a9960b8a6fd5f7b6be3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 532/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From db6f7be2772cd7fc53e63d89adc97dd2702ceb9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 533/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 28c2c8df41f77a675f2f003845fccc42259a4ae6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 534/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 664ebca5012d3ab7468e4df0c8be36977864c141 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 535/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 22f1c2bc6872ae68f944649291f5092b4e0f1559 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 536/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a3457089d2932f35a25786158e84686eb96bcff2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 537/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0a274bb982797b21fb9ed93257d638108787b8b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 538/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 4e2a5ad535781ff2d708f9502a8ac10692b89929 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 539/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0f0d341770777b4ea15e39fcbb091980c5d52b95 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 540/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 75ad25b52761d4584456f67fa594d87b0ad9ead2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 541/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From aa64774f5b459bebae372514ecd8be3901994540 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 542/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e11cae5483de0c84ad2595b2f9caf00cebc226c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 543/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 82c2055aeab6e605f15fc9565ec51e5f44b91a20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 544/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 994890107c8c45474b4fc542af1f07fa6848148b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 545/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 107c126347780a8044468271df88ecaac59b09d0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 546/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 26cd94ffc3268ddaf4af176c5734c6b39ea3a68f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 547/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3c724bfbf59c88288bf1d02f18b941b57180b284 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 548/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 962aba0037b46467aa864a423d68530cf112bb53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 549/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 05f6dd0c56f002c4833806c24aae5d7a642573c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 550/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 646bafd6d7eb392d0e426fe7ed5908ed06c8421f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 551/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 11ac78c26ce5e22724a17e418924febe99bbe5f2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 552/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 14ae34138868053ea1858b3df3580126dd8d9c35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 553/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 6c2d0a88030380c10e3bcf904c1e011be599c437 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 554/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1d3fb006301e948b3b4240e7d355aae051ea4f94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 555/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 483a6787ccd503029b4570f20c3bd4957333d0c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 556/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 5b48bbf99bc21af540eefe26622151f886ef5bc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 557/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 65d72b79c24a0553eecb17c21074f5e015e712b3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 558/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f6425a5dd968a6893a1e83b5b6e9faaba8b1e34d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 559/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e6904277b9d4def6ee60006a54aac20a3770910a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 560/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 405a2757c72afbf8350c30a3dbb1ba7c4cab899b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 561/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From fa92c85f1baf5c65d9bd93b6c5777c3cd438c0d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 562/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From d5ec815a43554b027764976eb7e9c8648522c5bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 563/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From bdfa6c318de49a60c16b5a59e3708250d7b8a8d4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 564/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 9e5f984daf0efd687824840ff64a4af982a30ebb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 565/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 74d21abba30b13510d3fca02f12b956307b7219f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 566/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d0ce700b6c77317cd9fdb2920d31511f35663ff8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 567/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 92730507b741be5fb554282c725952788b1a8a9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 568/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3c0c42f8e47ca8eadf802cf2839c8c1971d1ffae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 569/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From c8f20223f27bb141868ffa4fcb723e4dafa5d521 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 570/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 86ea08e5a1c32405f40d08329d481adf5d95c928 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 571/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1308d3454612c5268e7a4af8cceeb48a682e79e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 572/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8d3e2e28591af21205b48d89298a72956f4ad867 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 573/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0c9ee68a7ee1f90d350adc75ab30a3269fa7a6a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 574/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 88d7369681c64fc870566be070451a30a99e566b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 575/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0ab626434e762cb88e3713bbfb2004566364a661 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 576/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4f622b6fc53ef6fb9b0f4b41e1b74d4e5a66ce97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 577/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5e821ba1b9b5bc32075b2216488f447652423188 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 578/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 36e01c500110d54f02bd50a6ca539f15b218e57d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 579/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 22e06a471585baa5719adf022952f764711600f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 580/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 5148c56eaa039bc5699686f973850debc259e38d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 581/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 476cb6759ff48baa09fc9a39207335a7ee50af06 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 582/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 50937c8728820b6ff32cd97cb7337fc31aac8c10 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 583/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cab6c3ceb1d7e7144c565cde0004cd2db1b97fd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 584/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4204983cec48c61da453b976cab30122411689fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 585/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ff6e23a63321eff2317cc8f20b7e67bf94c1a809 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 586/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 48306f6583e6493a82e02f0d0f74617c57df51df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 587/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 864fe6c1b4c502a324758700ffc28e5cd27fc6e9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 588/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From ef89900684533e2aab995d09be2cbc3c1ba968b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 589/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0911514b3e7603177abd27a1d28d8c85206e6124 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 590/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 70fee9febd7c2d808e3370e9332bc0002f4c8597 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 591/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 5a1bb91f216b6e1f7579c873baa632029fc1a401 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 592/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From c79549bd429153f102cb398d5e7d11963a5a0085 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 593/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3ca76e13082c8445be2802c73ea6d47f336508a8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 594/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From bf394f3983f5460d03060e5720c3242d77da3cde Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 595/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5b7c17bb7e602a9225beff32801c6ca1a4f085b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 596/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 70c73acce1e56c5bdfb112befc77bb13b2da4440 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 597/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5008121fc30673af6d42628de962370f3a02c70e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 598/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From cde86bf74bd3281a499762f82dcfee6ea4e5f236 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 599/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From c08c4e820603c20575b9e7ed2e0a92ce2ff183ff Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 600/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b3bf244867bdd80057e07fd6e182234adf521cf3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 601/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 554ad25540a57834a4b81189d8a9fef965f9803f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 602/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 69f8fff63ad318f8fcf22de8ae0f62d85fef26b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 603/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 3c73b20185277c377195ded44306e9f59b43786f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 604/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 22ec62e8752fa530a028dba9809620569a7f12c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 605/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0c5081d2456d18f533d751620adf4a7cde0dec6f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 606/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5b370d4fcbb5d9e3a5c2a8ce5dd9741f0ab74760 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 607/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f318d8ef7c076291fabb786281c24aaaf4044e13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 608/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From bb3b117cc1b10cb367714a9a4159a7a2a17b7ac9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 609/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1c09852d678cbfd6a18df361ed3fb18a1df26342 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 610/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From e009d164070a5cc018f58595d60daf72b004596b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 611/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 5f4835ee8a40c698abf0c56547500fb286b794c8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 612/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d6f5ad6875c9b50e35c6b5cde17af72db99cfd64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 613/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8ccb7e4348da9fc2bd43d934e4e857c04c0123aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 614/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 77236bc819656918179ccc4fd6d741f9644fb5d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 615/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 9542808440540b308878ad7d424ba19aab58fd22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 616/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0000c662f427409b9729561dceaa266c53c8898d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 617/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7cf2dec85769b91f8317db23649343899e18323a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 618/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9ddb21f0d679e07f206690eeef29cecdb3204864 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 619/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f649fcb55c946edef5ae0ac117f4071b52c2d0af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 620/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8cc4e1154af8bf6a313dc4bbde9a8ffc565d8276 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 621/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3cc49130b308aa085e6b7482b8080f2390391ef1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 622/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 30e2a5c710ddf86b154339d51cacaa7ec6c3eabc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 623/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 77e30fafd1d1079c50a14c1b30e5f36aef603266 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 624/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 2071e69bd33aaab267b83dd8da950a21452fb255 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 625/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a53e24ee24aa5852ad43646eed064dff10611db8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 626/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 963a4eee920cb8c5e498c6a26efaffc01a445a72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 627/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From cf29e9c6f00df53ac17f8dc19252e946edbe7062 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 628/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 8453ae0d608d9253a7de185d9e9bae1fb9d4440d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 629/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b7f51d6870be10400d17b356971af85b4f6e1acd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 630/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8640e59ee1fae7c82b0e433b447d4a492238640a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 631/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5826347c1a9d0b9b756e7f8bbb706fbed0e7727c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 632/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From f79534bc571fa6e37aa13004a01fb566fb51c793 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 633/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 021391a24f664fd237c6f6e509e4d1e0140430ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 634/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From a3f2c960ad81eadb1561e8533165cfdba8b25374 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 635/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From c0a2d34dd31faab43e8128c147e01b4036c08a33 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 636/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7a9206c3be1033bcdb258d186ecf25530e0f39aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 637/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0193e62359d1a5a520f2e83bd8d2268660af88ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 638/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 31ed5cb5693711ad1ba1633f7c5ce91eb8c2ac4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 639/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From a103713285f6f265996ba8a5d55f2b94e56967d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 640/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From af0ac367bbd78c2be2a6af461d4137a4e65d7be9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 641/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d6ee1614278ee9deb00f5ca0b346f16bf9781891 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 642/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 5246cf35fafa7399cb457850d0d045c6ef2183bb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 643/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 749f20b8ba9a05e12a0082c60d1f011aaf6f1604 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 644/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From b133bbe10a12dacf58a8f14c8a4fbfdf23569981 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 645/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2db6c7e1cfa85c9249052384bc06688ea9d6cf8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 646/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 68d0aa00a337ea81c36b58e2a64573255d6df277 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 647/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 8f2a77b4b4e93b44b1dc49581b810db37420cdf3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 648/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 74cef79432ad2643aa49abd2c5b1bb8a08b62fb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 649/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ced2674b415b2506b0315fc309db74d86ce24394 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 650/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1723f0bb5187eae7e0c50022a2206ab14c244e52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 651/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 2e048ed878cd591285123509f0695bf8be89d376 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 652/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b1498a6b5756567b30b48baf79025e36e51f4092 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 653/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 8e7aa941b72b00f918fd1929abdd01b4b37658bf Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 654/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 8e91b947a03f4c57df28a73f7f8f488614f7f5ca Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 655/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 35bed9d188e4a78d3984718a1641e663465d1e08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 656/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 441b72608465feb11082cdd7aec4fe815044ba70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 657/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1611b27de7e0a4d5c96e3f19e602aa0e9252fdb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 658/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From bd041cc6435121b298e3ab0ef1b00cf6ccc72ec4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 659/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 8c04e30ebce2082a702e33bc2b5b7ed0e9354b25 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 660/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 5f9a7d1a4715fc858e0715637c023280d3165ea7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 661/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c77e94c96984a648531fd1b2eb6a910e702240dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 662/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2efeeb7bc99eee9932dfb66ed50ac3e32aa22c61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 663/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From d1a77335b5f9ef8dc6fd2f0f9436f8673d3db517 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 664/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From e8b459cf19d8901a55798d2b7ac9f2da1a6894c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 665/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 33c9863d42265e5c492f029fdf6394b25aeaabb6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 666/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 6ad4f0713bb7776e7cafec9b49ebb759bdce4027 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 667/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 01d3bb489007339cc7f88fb6c9c72082e4975eca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 668/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From cf320ff4f82eb130e76834b6bc5440fe9735be7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 669/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c89c968f5884c9c800c75158fa7194c1a19cdce1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 670/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 762f3696bdce2325a2818e1cdace76f53b29348e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 671/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 05793fccc0b58c5eb8c44ea1ed86780a9c36a648 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 672/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 05c85855b01db0e4731816f431511edad64e789b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 673/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9d893cb011163db12c8faaa1c4ab17cd80aac627 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 674/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2178e6fc659ca4b4db5e38579c75341c87b28d43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 675/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 178a333f11aa89c1daa83f7b4ac624c660fcf1fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 676/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3390c31f33c322dc8e2c4df366f93e13b2b438c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 677/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 22de41ef4532036032b613a71b74525cef9fa0a0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 678/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d537288991aebc38dc4635ea359a94b726130e07 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 679/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 3ff7b0fe7794c666da3d6c950ae29745c3a57bd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 680/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 45c81f7bbcd1c7a584e51800527d48a818f4171b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 681/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9abd4a45cad1887238580965d1ae7ed667ff9db8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 682/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 9b2bf7d4765c0fd51c01cc97ff55a6caad7e938c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 683/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 566a2d667378ca5771bcb4935111fdbb53f319c1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 684/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From ecad66b41484c893db5244aa078a09a30bf3a26c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 685/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 4b8badb6820a6bc9d3413f1c21777c91fe9f8b6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 686/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From af7b8f38debccdcbd890ca5db4dbcc510545bd61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 687/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 761393bba87d1c2792f9307b397fb3aa7dadc4b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 688/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d1b03737db7f357582f398125048805dd7c8adb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 689/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From dd5423ee76fb439154bfbc0ee4484b6746f29f91 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 690/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 61bc2062f7472f4b8409621322c0881866adb0be Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 691/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ecf511736a0978982e4844c6249ac31311a69778 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 692/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From d398e89ebca8a4bddb89346871b76e59795b839e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 693/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 6c8c9a7a14985cc860614a7a4ea5774d52dcbae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 694/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 87cd78743cbea66fdd3fb08eefa6f76b00bb27d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 695/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 3f0a8bac031477b50b87066812bb3f7085d06054 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 696/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From b5b9e366565721bf6c10df99cf0ba72adb7348b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 697/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ee05a285da45cc2b2b5a6b0448002e08069b9999 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 698/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 87e728674e82002233295019da25124ee666df36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 699/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 65bf72637b02d0dc4647acbb49ebe6bd91f710d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 700/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 41f7ed167567a240f795d8343c2a8179f2751eba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 701/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From d463b02ba72979f4652fbe8b8f319d166624c39b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 702/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2d0e3187cc912ec5f7c25a204514e8f6fda7ace8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 703/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From ad2cead4d66a03bc0ac2afaf8468fc5989eaa79c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 704/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 61c9fca77e1a77c05e83d22762b851b44a868006 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 705/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e77cb5a7669176f62a1d08f2f4b8cd93e8b2a563 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 706/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 4cd75720bc3921df4d8830cc298343ba0a742578 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 707/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 494ba01d8619aee85a7ba86522a3a3966e2e15e6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 708/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 90d229426c3acc264bc2f0f3617c50630786a52a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 709/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 6d6fe7854a598d5c286b46852dcaf32e3d455c67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 710/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 11ddc245778278cd2cb9dd5fd8aa6b918cd5ec32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 711/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From c4e8bce354f0300cdd38a9e5df724f40d084aca6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 712/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 450cc12720a0de467a14b1a861898b2b504ee456 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 713/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From e6b3d33b7dde2f0b8c9da762baf5d135eb011b71 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 714/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From a3fc85b51423fd1780d0bf68ec109bac3f7ee3fe Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 715/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 2a6be6a2c730e082271f7b8ca081b390d0ad1a5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 716/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From bcb6f1fe31bcfefde2fd28bb56374f4d9a5d714f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 717/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c550b21738d85c9533d1a10b1aa147a47e178fe8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 718/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 0dddbce821e1d2e6066d0f36e917595f210e71e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 719/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 8a1d384ab6579bfa7b9973dce925f847e8b60a6f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 720/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From aa71eb05cdfe7f19b06ccbc1fe7daaf3ed668939 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 721/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 840c83e29ac419739e65afd99c5b204350134d0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 722/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0e10ac3080aa8f6a697896442d9050f32e77aa43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 723/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 36fa83467cdef46b46cc3f896a072df85323b800 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 724/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0c566ca556eb81b492ea5722f635e624c85712de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 725/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 7d50ddd1326f6263d7c84e51d19dad2a617cfe15 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 726/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 0329c2346a9de899e94948b1ee1dcd77868a7d04 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 727/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 86a12aecf2386be67ba9a43dedd85b6d5882b5be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 728/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 61d3bb6acd09077d96b05625ce69ec07b422ba95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 729/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From eaa29f1f7f89c79a2f5252b35c5340c6ec94369e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 730/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From b6254663f841608ef036a7209340afe5232af8bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 731/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From ce1eb5c519d51efceaf4d1924c28d457720886b8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 732/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From c2cfb2e7ae752d820c37095798856ace8af77a1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 733/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From dc3aceb1f024c8df57bc6b4de782c85cd7d643ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 734/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 03f061082e81d9d39dc3c46605138ffbfd6f5307 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 735/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From b2ed471acdd1d7439096d6779686dd71f07ea8ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 736/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 9c37675c1adae4962f52780f929b5a60d8d085e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 737/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 2c90d4a131efda0d446c553665ed89bfde951aa5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 738/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From adf96ee19682939d5b3d9c6a64f2e8abdb16a887 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 739/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 1046d4553085e8c64eba9e4e32cdc0017c8cff79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 740/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From c53c363290e9cf6b1506159353e406945d69226a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 741/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From b7783e075fde61bd49c286cf250c8f977b2ef257 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 742/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 7c99302231245387b9fbd3a7200e075f7012a3f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 743/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4d0b67e5580ec55e911717fb28e0581359106282 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 744/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From cdc037fda9d0a0f066d3cd185e97039bf75f34a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 745/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From affc27da329edd68ba805d411836a902c826092b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 746/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From bc63eb1603d19d9611bc84e31cf51317155ec9ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 747/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From f29aaf8afcee805362a90f148c7ac81f90001529 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 748/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 879c1ca1c62846b6bb2d1baa26861f5beed2349b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 749/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 92b31b2ec85415840c1776356cc3990cc49b99e3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 750/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From dd45048489613c0e0569556a05594359b79034c4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 751/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From fa9ad0727814112beff5cc3a63ddcb58f2131732 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 752/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From e6f7a4f59843798c8d07f0ab6ff14186d284c74c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 753/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 593fe943ddbc3facc8a1aa830e0293ee43f66a7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 754/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 017f751cfcfa503087ad05905e501804cf866e36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 755/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 4d4f65db930dcd6c9f4115d740f3e7744184bbff Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 756/772] Update PSGalleryModules correctly --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From f74d2f32a65c30a445f77136ec4dce84cc69e1b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 757/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 9ae2feacf340985a25ee0b960792e495bfaecb24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 758/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 01c58afed5cfdb623eeae868a5d4228cc388d9af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 759/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From 6318c62577a74970c6f0e7208ba4157e5fbad974 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 760/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0752ba9e456228fff5bc0c9694b2e67e92271881 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 761/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 49687feeb4c6a8f9fcb4cb2ed12d6ad59be4fde7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 762/772] rebase conflict --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 50668324148c649a1501066afa968496f5ff8f04 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 763/772] Rebase conflict again --- src/Modules/PSGalleryModules.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,11 +14,7 @@ -<<<<<<< HEAD -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 58876408c53fc7fa121e67423041ef7e8c4d02a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 764/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..7eff795bdfb 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 37232f8d828fbe33a5e74224780e9ad788cdb281 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 765/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 7eff795bdfb..50ffc666d52 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,8 +14,12 @@ +<<<<<<< HEAD <<<<<<< HEAD +======= + +>>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules ======= >>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules From 06535305e7145f1d89528639b80231a58daa131b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 766/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 50ffc666d52..892e510cef7 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,15 +14,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules -======= - ->>>>>>> Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules + From d0701941b0188dcc04585c8f38acf84e0fdbf5c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 767/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 892e510cef7..78980e12d5f 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 0f6152404628b8fa3fa13deab97b3031d256dffa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 768/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 78980e12d5f..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 330cad7600f70804cb1802016fa24559020d2015 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 769/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index f2dfd6af95e..624857837bf 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 930fbcb99f9dca2d78abcb917a9a807b00e54425 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 770/772] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- updated-dependencies: - dependency-name: PSReadLine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Modules/PSGalleryModules.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 624857837bf..f2dfd6af95e 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -14,7 +14,7 @@ - + From 26f71c8d44204758ca6a55bf0c1b4203759cc074 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Tue, 3 Jan 2023 16:11:30 -0800 Subject: [PATCH 771/772] Add WDAC events --- .../host/msh/ConsoleHost.cs | 27 ++++++++++++++++-- .../resources/ManagedEntranceStrings.resx | 9 ++++++ .../engine/Utils.cs | 11 ++------ .../engine/remoting/common/PSETWTracer.cs | 4 ++- .../logging/LogProvider.cs | 28 +++++++++++++++++++ .../security/wldpNativeMethods.cs | 19 +++++++++++-- .../utils/tracing/PSEtwLog.cs | 16 +++++++++++ .../utils/tracing/PSEtwLogProvider.cs | 16 +++++++++++ .../utils/tracing/PSSysLogProvider.cs | 16 +++++++++++ 9 files changed, 131 insertions(+), 15 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs index 19bb79977e7..e2b7bd7b8ba 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs @@ -180,7 +180,7 @@ internal static int Start( // Alternatively, we could call s_theConsoleHost.UI.WriteLine(s_theConsoleHost.Version.ToString()); // or start up the engine and retrieve the information via $psversiontable.GitCommitId // but this returns the semantic version and avoids executing a script - s_theConsoleHost.UI.WriteLine("PowerShell " + PSVersionInfo.GitCommitId); + s_theConsoleHost.UI.WriteLine($"PowerShell {PSVersionInfo.GitCommitId}"); return 0; } @@ -1831,8 +1831,29 @@ private void DoRunspaceInitialization(RunspaceCreationEventArgs args) const string shellId = "Microsoft.PowerShell"; // If the system lockdown policy says "Enforce", do so. Do this after types / formatting, default functions, etc - // are loaded so that they are trusted. (Validation of their signatures is done in F&O) - Utils.EnforceSystemLockDownLanguageMode(_runspaceRef.Runspace.ExecutionContext); + // are loaded so that they are trusted. (Validation of their signatures is done in F&O). + var languageMode = Utils.EnforceSystemLockDownLanguageMode(_runspaceRef.Runspace.ExecutionContext); + // When displaying banner, also display the language mode if running in any restricted mode. + if (s_cpp.ShowBanner) + { + switch (languageMode) + { + case PSLanguageMode.ConstrainedLanguage: + s_theConsoleHost.UI.WriteLine(ManagedEntranceStrings.ShellBannerCLMode); + break; + + case PSLanguageMode.NoLanguage: + s_theConsoleHost.UI.WriteLine(ManagedEntranceStrings.ShellBannerNLMode); + break; + + case PSLanguageMode.RestrictedLanguage: + s_theConsoleHost.UI.WriteLine(ManagedEntranceStrings.ShellBannerRLMode); + break; + + default: + break; + } + } string allUsersProfile = HostUtilities.GetFullProfileFileName(null, false); string allUsersHostSpecificProfile = HostUtilities.GetFullProfileFileName(shellId, false); diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx index df68fb8e70a..65d5ebe041d 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx +++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx @@ -120,6 +120,15 @@ PowerShell {0} + + [Constrained Language Mode] + + + [No Language Mode] + + + [Restricted Language Mode] + Warning: PowerShell detected that you might be using a screen reader and has disabled PSReadLine for compatibility purposes. If you want to re-enable it, run 'Import-Module PSReadLine'. diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs index 295b7f931ed..61f10ab6930 100644 --- a/src/System.Management.Automation/engine/Utils.cs +++ b/src/System.Management.Automation/engine/Utils.cs @@ -1457,22 +1457,18 @@ internal static bool IsComObject(object obj) /// NoLanguage -> NoLanguage. /// /// ExecutionContext. - /// Previous language mode or null for no language mode change. - internal static PSLanguageMode? EnforceSystemLockDownLanguageMode(ExecutionContext context) + /// The current ExecutionContext language mode. + internal static PSLanguageMode EnforceSystemLockDownLanguageMode(ExecutionContext context) { - PSLanguageMode? oldMode = null; - if (SystemPolicy.GetSystemLockdownPolicy() == SystemEnforcementMode.Enforce) { switch (context.LanguageMode) { case PSLanguageMode.FullLanguage: - oldMode = context.LanguageMode; context.LanguageMode = PSLanguageMode.ConstrainedLanguage; break; case PSLanguageMode.RestrictedLanguage: - oldMode = context.LanguageMode; context.LanguageMode = PSLanguageMode.NoLanguage; break; @@ -1482,13 +1478,12 @@ internal static bool IsComObject(object obj) default: Diagnostics.Assert(false, "Unexpected PSLanguageMode"); - oldMode = context.LanguageMode; context.LanguageMode = PSLanguageMode.NoLanguage; break; } } - return oldMode; + return context.LanguageMode; } internal static string DisplayHumanReadableFileSize(long bytes) diff --git a/src/System.Management.Automation/engine/remoting/common/PSETWTracer.cs b/src/System.Management.Automation/engine/remoting/common/PSETWTracer.cs index d59e8828830..b9c599d53e5 100644 --- a/src/System.Management.Automation/engine/remoting/common/PSETWTracer.cs +++ b/src/System.Management.Automation/engine/remoting/common/PSETWTracer.cs @@ -159,6 +159,7 @@ internal enum PSEventId : int Settings = 0x1F04, Engine_Trace = 0x1F06, Amsi_Init = 0x4001, + WDAC_Query = 0x4002, // Experimental Features ExperimentalFeature_InvalidName = 0x3001, @@ -241,7 +242,8 @@ internal enum PSTask : int ScheduledJob = 0x6E, NamedPipe = 0x6F, ISEOperation = 0x78, - Amsi = 0X82 + Amsi = 0X82, + WDAC = 0x83 } /// diff --git a/src/System.Management.Automation/logging/LogProvider.cs b/src/System.Management.Automation/logging/LogProvider.cs index bca5d5fb930..b7de1f60b4e 100644 --- a/src/System.Management.Automation/logging/LogProvider.cs +++ b/src/System.Management.Automation/logging/LogProvider.cs @@ -109,6 +109,19 @@ internal LogProvider() /// The amsiContext handled - Session pair. internal abstract void LogAmsiUtilStateEvent(string state, string context); + /// + /// Provider interface function for logging WDAC query event. + /// + /// Name of the WDAC query. + /// Name of script file for policy query. Can be null value. + /// Query call succeed code. + /// Result code of WDAC query. + internal abstract void LogWDACQueryEvent( + string queryName, + string fileName, + int querySuccess, + int queryResult); + /// /// True if the log provider needs to use logging variables. /// @@ -386,6 +399,21 @@ internal override void LogAmsiUtilStateEvent(string state, string context) { } + /// + /// Provider interface function for logging WDAC query event. + /// + /// Name of the WDAC query. + /// Name of script file for policy query. Can be null value. + /// Query call succeed code. + /// Result code of WDAC query. + internal override void LogWDACQueryEvent( + string queryName, + string fileName, + int querySuccess, + int queryResult) + { + } + #endregion } } diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs index 970abe541f6..e5a46ada0e2 100644 --- a/src/System.Management.Automation/security/wldpNativeMethods.cs +++ b/src/System.Management.Automation/security/wldpNativeMethods.cs @@ -7,6 +7,7 @@ #if !UNIX using System.Management.Automation.Internal; +using System.Management.Automation.Tracing; using System.Runtime.InteropServices; using System.Diagnostics.CodeAnalysis; @@ -110,6 +111,7 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement( SafeHandle fileHandle = fileStream.SafeFileHandle; // First check latest WDAC APIs if available. + Exception exError = null; if (s_wldpCanExecuteAvailable) { try @@ -124,6 +126,8 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement( auditInfo: auditMsg, result: out WLDP_EXECUTION_POLICY canExecuteResult); + PSEtwLog.LogWDACQueryEvent("WldpCanExecuteFile", filePath, hr, (int)canExecuteResult); + if (hr >= 0) { switch (canExecuteResult) @@ -146,15 +150,22 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement( // If HResult is unsuccessful (such as E_NOTIMPL (0x80004001)), fall through to legacy system checks. } - catch (DllNotFoundException) + catch (DllNotFoundException ex) { // Fall back to legacy system policy checks. s_wldpCanExecuteAvailable = false; + exError = ex; } - catch (EntryPointNotFoundException) + catch (EntryPointNotFoundException ex) { // Fall back to legacy system policy checks. s_wldpCanExecuteAvailable = false; + exError = ex; + } + + if (exError != null) + { + PSEtwLog.LogWDACQueryEvent("WldpCanExecuteFile_Failed", filePath, exError.HResult, 0); } } @@ -263,6 +274,7 @@ private static SystemEnforcementMode GetWldpPolicy(string path, SafeHandle handl uint pdwLockdownState = 0; int result = WldpNativeMethods.WldpGetLockdownPolicy(ref hostInformation, ref pdwLockdownState, 0); + PSEtwLog.LogWDACQueryEvent("WldpGetLockdownPolicy", path, result, (int)pdwLockdownState); if (result >= 0) { SystemEnforcementMode resultingLockdownPolicy = GetLockdownPolicyForResult(pdwLockdownState); @@ -281,9 +293,10 @@ private static SystemEnforcementMode GetWldpPolicy(string path, SafeHandle handl return SystemEnforcementMode.Enforce; } } - catch (DllNotFoundException) + catch (DllNotFoundException ex) { s_hadMissingWldpAssembly = true; + PSEtwLog.LogWDACQueryEvent("WldpGetLockdownPolicy_Failed", path, ex.HResult, 0); return s_cachedWldpSystemPolicy.GetValueOrDefault(SystemEnforcementMode.None); } } diff --git a/src/System.Management.Automation/utils/tracing/PSEtwLog.cs b/src/System.Management.Automation/utils/tracing/PSEtwLog.cs index 8212cf55cd8..438d7b5f059 100644 --- a/src/System.Management.Automation/utils/tracing/PSEtwLog.cs +++ b/src/System.Management.Automation/utils/tracing/PSEtwLog.cs @@ -128,6 +128,22 @@ internal static void LogAmsiUtilStateEvent(string state, string context) provider.LogAmsiUtilStateEvent(state, context); } + /// + /// Provider interface function for logging WDAC query event. + /// + /// Name of the WDAC query. + /// Name of script file for policy query. Can be null value. + /// Query call succeed code. + /// Result code of WDAC query. + internal static void LogWDACQueryEvent( + string queryName, + string fileName, + int querySuccess, + int queryResult) + { + provider.LogWDACQueryEvent(queryName, fileName, querySuccess, queryResult); + } + /// /// Provider interface function for logging settings event. /// diff --git a/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs b/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs index 09b1cd9b0f0..9b56da1ae72 100755 --- a/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs +++ b/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs @@ -202,6 +202,22 @@ internal override void LogAmsiUtilStateEvent(string state, string context) WriteEvent(PSEventId.Amsi_Init, PSChannel.Analytic, PSOpcode.Method, PSLevel.Informational, PSTask.Amsi, (PSKeyword)0x0, state, context); } + /// + /// Provider interface function for logging WDAC query event. + /// + /// Name of the WDAC query. + /// Name of script file for policy query. Can be null value. + /// Query call succeed code. + /// Result code of WDAC query. + internal override void LogWDACQueryEvent( + string queryName, + string fileName, + int querySuccess, + int queryResult) + { + WriteEvent(PSEventId.WDAC_Query, PSChannel.Analytic, PSOpcode.Method, PSLevel.Informational, PSTask.WDAC, (PSKeyword)0x0, queryName, fileName, querySuccess, queryResult); + } + /// /// Provider interface function for logging provider lifecycle event. /// diff --git a/src/System.Management.Automation/utils/tracing/PSSysLogProvider.cs b/src/System.Management.Automation/utils/tracing/PSSysLogProvider.cs index 629cdd64476..e7accd6978c 100755 --- a/src/System.Management.Automation/utils/tracing/PSSysLogProvider.cs +++ b/src/System.Management.Automation/utils/tracing/PSSysLogProvider.cs @@ -102,6 +102,22 @@ internal override void LogAmsiUtilStateEvent(string state, string context) WriteEvent(PSEventId.Amsi_Init, PSChannel.Analytic, PSOpcode.Method, PSLevel.Informational, PSTask.Amsi, (PSKeyword)0x0, state, context); } + /// + /// Provider interface function for logging WDAC query event. + /// + /// Name of the WDAC query. + /// Name of script file for policy query. Can be null value. + /// Query call succeed code. + /// Result code of WDAC query. + internal override void LogWDACQueryEvent( + string queryName, + string fileName, + int querySuccess, + int queryResult) + { + WriteEvent(PSEventId.WDAC_Query, PSChannel.Analytic, PSOpcode.Method, PSLevel.Informational, PSTask.WDAC, (PSKeyword)0x0, queryName, fileName, querySuccess, queryResult); + } + /// /// Provider interface function for logging engine lifecycle event. /// From af4ecec19844601054c547828a430063ed85e421 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Thu, 5 Jan 2023 09:56:03 -0800 Subject: [PATCH 772/772] Fix CodeFactor issues --- .../security/wldpNativeMethods.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs index e5a46ada0e2..730db922a00 100644 --- a/src/System.Management.Automation/security/wldpNativeMethods.cs +++ b/src/System.Management.Automation/security/wldpNativeMethods.cs @@ -6,10 +6,10 @@ // #if !UNIX +using System.Diagnostics.CodeAnalysis; using System.Management.Automation.Internal; using System.Management.Automation.Tracing; using System.Runtime.InteropServices; -using System.Diagnostics.CodeAnalysis; namespace System.Management.Automation.Security { @@ -111,7 +111,7 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement( SafeHandle fileHandle = fileStream.SafeFileHandle; // First check latest WDAC APIs if available. - Exception exError = null; + Exception errorException = null; if (s_wldpCanExecuteAvailable) { try @@ -154,18 +154,18 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement( { // Fall back to legacy system policy checks. s_wldpCanExecuteAvailable = false; - exError = ex; + errorException = ex; } catch (EntryPointNotFoundException ex) { // Fall back to legacy system policy checks. s_wldpCanExecuteAvailable = false; - exError = ex; + errorException = ex; } - if (exError != null) + if (errorException != null) { - PSEtwLog.LogWDACQueryEvent("WldpCanExecuteFile_Failed", filePath, exError.HResult, 0); + PSEtwLog.LogWDACQueryEvent("WldpCanExecuteFile_Failed", filePath, errorException.HResult, 0); } }