From 65e022e2b75c9e280e7c694e4da899aa307e9708 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0001/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9b32f31b5e39bb9c55c4ab6763eb7456fe0ecde9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0002/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5e03ec1c1a2a8ccebbe29136f861a3d29540fcb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0003/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5ae07c32d6efb9ee2d282a52d553a895f687cdc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0004/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 841856df8dc340b046b3304ce5fdb59388fc313e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0005/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 69d54be1ad3553f6cf691be392be8be62c0bbe8e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0006/3081] 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 90fac52c878105420afb762b8a2c510c462ffe2b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0007/3081] 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 404f60a7ea0d296c6f9b96100767f53b00817fa4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0008/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b9c11122c22b661654d3ac073f695222dd7a7868 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0009/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 42f43b5dd584e97551bfd205cfc716a8541e761c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0010/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9615cad6e856b6e43d9ed7c015e02939c8303cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0011/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dfb1b4c743bfada5a9684f5746d41e75f788090a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0012/3081] 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 2a0009b83e8dedd48db0131a2729351c87ecde42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0013/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 698ff5f10cd01a00b20ce04993b474e2b8ebc177 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0014/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 63f1fd8507ef28e34c9e88c44e4957ca4c8d23a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0015/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6ae9ed10f191e6e4b195782e348e557fd8c56eb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0016/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5043a8e4f6017ecc7a9b2c8143c0bdbd915c20b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0017/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5674658a0f363737e1a2e04fe4a6030cb130d5cf Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0018/3081] 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 798c778e7c826f2ca6013cc912a047b5c6c7baf8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0019/3081] 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 e2c321893b5996c3fa41e71ae0aa483e2a807d16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0020/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c60d4b84234938eb6c0317ad0127b7d2a9fa697c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0021/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 37678624612c195f41869a6f67c8428d021662b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0022/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 44ec83a2291bad69d75a75fc459323d093581e27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0023/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8418fec83e5cc2664247fd8a187658ab0da3e160 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0024/3081] 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 e0192fb20ba650b32370d3aa77caaab2efeb02dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0025/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 921bc424bb9eea167e14907721d02c10667503e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0026/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c8a731b37637e93b2e44c4a94fba90b55bd46c25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0027/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4776c85e14e3fea4029e730994b8aafa29a2a8bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0028/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bfc0457d34eaa1475b782c74211d888b9fd6973b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0029/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c08be4518ab521b198f35a494d01fd144288cc1b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0030/3081] 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 d49a11522eaca24f88e46707a274af392520d102 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0031/3081] 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 a2cd31fde0e22fbf6a752f10cd7da6b9fb0317ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0032/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e3e1f73c8ab270d51bbd79e06a041f1315833943 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0033/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aa52bd05bc7c9f243160f2f629c589df999ec784 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0034/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 41bd9a8c7692812ce571b5cf351b19ba1f34ae83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0035/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bac0c89effeec84844dd6381e209d1d03261710f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0036/3081] 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 7c8290570d598266dd9d180bba1b8c601324bf67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0037/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0269e5a27f38e3a5356d834d497b81963d9af761 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0038/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 415e26c66785bf15befd6a6e7792da89514d1236 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0039/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1fe0603dba907165141ae1c2a1a542992a69bbb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0040/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c23ca8fe7178fa9ff5670e140308ce2460a50567 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0041/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e5371e095558719ce210003833580c98ec4cece7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0042/3081] 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 3c733635ead0a20299701359eda2cf1336205df7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0043/3081] 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 94b7c0e2b143206a8d6449608a4cc7ae7435009a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0044/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3d505348aa72df253b51a4d9a743efb84e94f090 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0045/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b9265edf0531f0661d76811cf036cf59c288aeb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0046/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d8612da544d8dbc41934f7586494f76c4b203450 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0047/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 30cbf3a66c8bd7dcc1f0c35dae43444883619195 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0048/3081] 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 9552b3efb8ffa6d99afeafbe7217be869c2228e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0049/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 720561721fe7685a74d21cbf7e692f3fc4a23101 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0050/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b636bb236adac6f807aea2ee19b8cbf759848972 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0051/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 060e95de10ca4d310f0bfa208b674f78c092cd1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0052/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 04245f5151944169ba1f024dd389845ce704581a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0053/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dff48f02490fdecf837e04706428f8c3c85da781 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0054/3081] 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 b42db9daea842b285d4927477feca63702602c27 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0055/3081] 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 dd53e02c36873eb004a143deeee828e6bfc036c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0056/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c7401150e84235ae99183d2f8a727b0420df32e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0057/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 544c39c771f77eaa28d1d69ae33931390885f3b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0058/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 09c3c62abc534bf43359d8f82239b8e76500927d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0059/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 92cf958b90db1b1e19664faa1d28f5b53a06b9d9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0060/3081] 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 652c270e508a64c4a67c5b7fd3cf52a1a1ed257a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0061/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 59f56683f17f917b5ed2193e2469c5d347c3ebc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0062/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 71739636c5b069fe5ba0a0fd0b653ae2f0806df0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0063/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a0e3e7453ba7a70d2bc965cd683a7df7ef5202aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0064/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 581889521fa4821eb8521f13bd439061b4198a0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0065/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 79dffc7171f01ecbbf8ceddd9f1ce6d7203354ff Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0066/3081] 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 d93f70fe20f433c55f63bb9af4f3c37770edc75b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0067/3081] 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 9e9cebe4b8c6408fd2301043983b5996c4a51574 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0068/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4e7ee899e997e2c18f95623d5c9193a7d63c23c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0069/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff274fdb6c477d6f3f370777d796a925a31b94dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0070/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0af44b2dcc6dd20a58d8609d174f555e635b064d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0071/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7a6787a8459d0057851de4e6788cdbcb9895982b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0072/3081] 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 b48748978e5749929e9e60bf07210e9dfc23e6e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0073/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bc8636e84b0b27a1955eaa3c502d28e4c7d1cd5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0074/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ae4ad51f8ad6599a7a077e0c959ae99dd6b5e447 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0075/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2e8dac53eb671bc43da3745f964a492d2a34f5b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0076/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9126bedd9cc08d09a1f375837638f32ea2f237bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0077/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d56c77baa5745b8ed690ea2fb4a25dec30ea3ed7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0078/3081] 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 1171e84d3cfa45804f423e7ba5169895e92fa28f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0079/3081] 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 e7751a2f2490572ce856278730fec88a1edb499c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0080/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e39a248c596e8694401fa3393ff2a30db4119a49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0081/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 270c1c5261b716cd3dda5e99ba7255a568269388 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0082/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 13b719790cc93ab70354dd1663caa4757effcc7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0083/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba2bed05367ee7ea4691c56a16037588bb709576 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0084/3081] 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 7bd5f10a415708bab5525310e615a58ecd66c8bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0085/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2a483509bd22c6ead204019d578306f7ed4930cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0086/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5041cb44dabdcdb7280585aaf84537b8a82c02d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0087/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 28eeb629b7dc69f6596ff1eb1bf66d18449345b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0088/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e029c81dcd30b49a81a230351c6ea8342a623838 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0089/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 95327e407084be5555dc5a7050cd038a8d3c14be Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0090/3081] 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 da68e9b52863ed9b5986e81157c827787db687ea Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0091/3081] 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 98cadb3d13c997715d895d7bc37cdc2d5afdc9a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0092/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d8f1f11f2555e1772229287ff224255400ef8626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0093/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f3d1095ec094738fca9d3a7cf3e5f98c47e7d2b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0094/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9aae13e717d129cdebf2bc94f2155ee5e19fd021 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0095/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c690ebf925db0126dd5ca87903a0880b8dfa0178 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0096/3081] 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 6209373140997899c76ee9c362eaea2f483b086c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0097/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 be568e1e911cd24502e4418900152ff5a1f203dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0098/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 222e7546ffcdc3af5fabf84553a4fef065661944 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0099/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1186bcde162930b5dc16ec36f9b165d71bf3fd17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0100/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3073a6f5bf1241add6104956396d4cf0020a55e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0101/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 649581a31309a4d9734166a9336609c15d35779a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0102/3081] 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 cba1fff5fa6aa68bb22f439619359ede49550ed3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0103/3081] 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 16d621b26cfff935c676d04b5b5a10e1b0b1a7cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0104/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9e50364aa3eb44d0ae1c2d087daad883af33edd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0105/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 217603310cbff395b0d428b918afe14aca39f654 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0106/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0b73cd720160a3c91cf2d4b369efd2178a4a3034 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0107/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6881bdd7c7516ea3895d913cf9123647f6850672 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0108/3081] 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 5d49a629f1ff99cfc46741d2cfe43531a246839f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0109/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 55a1c411cc274759caad01c5a800e73455ce2455 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0110/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 61da58d35aa0f79d3cb36207d9e38594fb085b7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0111/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 74781295899c7cdcb3d25a2bab1dbd16fb904cdc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0112/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 72b9e2479d4a79ac6ad731898994a329070baa1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0113/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bb66aab54958f5fc5f74fa63e68efa8148f6e2ed Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0114/3081] 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 26a94de0ca7fc08284313e923e01d8eb10484ed3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0115/3081] 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 9e9e4e6f76e694a4ff0dfe6fad2ce637c4cb8bb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0116/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9b30555cef4e56121cf09e362fb40aa6355e4058 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0117/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4a1688c0484518558d82dc2b923fe699faed4e5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0118/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cd351cca2d92d68310a31c9eea0ef5c52bb56799 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0119/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5935016c66d6d925a6a319b03c60bcb594efc3f0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0120/3081] 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 896acb0b8886cd145cd6d04d7940c5e61d5d1a81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0121/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e01d0d56f5080949775c54b922c635027378c040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0122/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a39b26250109f2a9f74ce7fa35bbbc36139022fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0123/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4e38586540d5c2a1479331f7bc0e7d7ea74ae1b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0124/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 54533a34d334d07d8bc8ef33dd95f46b41e427c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0125/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0cd4d04d6d30fc82e5ba689b01cb8fa2794bda18 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0126/3081] 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 d9854503a7772bc6b56cf8956cb44e1a4657caba Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0127/3081] 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 ec0c2e953866e5435cb01c8e81a9f08888361375 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0128/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d7ba22a6ecdb8ac3df921ff5f2c448c3dec71213 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0129/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fa97d936d1329a457a12dfb060c5589e1b5b355e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0130/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ef3d23615141e2906da54a13a776cc0563af8521 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0131/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9a47f1ed8cdbc91dcadb692f24c1da8fe52491b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0132/3081] 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 ce996a70244b175a1ef4f7cce153490471508024 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0133/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fdd961a3d3be7e2d76299518aa10ba113eb0d1c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0134/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 891ff180b5c7c674180376ec8185ba04eb209d0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0135/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ed39fabfd5a75d55776bea4ffc6add8616559f0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0136/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cfd038357611ba8e6ec562d1e6f178062f004c38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0137/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fdb8e14291034c67ebfd2cc2ffb72ca702c14799 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0138/3081] 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 0c066d52653af249298d63a2a4a6c9cf4d84670d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0139/3081] 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 b07a7d842447f5ce53cac2bbaffcba51ce7ee696 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0140/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 88cf519244f19ad33b7e3fb721efbc470cafc4a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0141/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 beba57f811629924d8f83bcd7119b3c76abd8f78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0142/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7c824842d432e421ae4c6a98db947d313ecb563f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0143/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ae147b434a8f761535b5bdc85d37773a2302db45 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0144/3081] 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 4eb16c8edf062f9a5a0a75a23cb0c15d8c64819e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0145/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6a58fcac04885eb3790d55d156f76a3ad9b2f2bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0146/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c9c1de0437154cd1310fcd4c6d9e7f3a44957e43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0147/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 78eef6e141c1a0ea3f08c3c6dd33155cb6362040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0148/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 149be1f40306389e33b58e77ca6eb718e10a863b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0149/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7b54ac73049ad5c60a88a3eff56160f3a5299413 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0150/3081] 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 f3598444b15271468dfac0e50924b876f279567b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0151/3081] 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 b382ac21f88613726f2a784b456898203a6c2284 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0152/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d005674f29ead45c21a6a0a06af59ae2d660e0ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0153/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7e81118d760cf0d471ca29b08acbfd72ce99130f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0154/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cdfea98be0a0551e3e7ceda63f8de7fb8865ea0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0155/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7191c72c3cd8f5db3ca016892a050c2798489fcd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0156/3081] 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 c0f721bd9f75372dc0bd75c99b51ec95391e4c35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0157/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 228fd786a4069a8b8a9b9a4a44cbaf8230e2b173 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0158/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f265bbb7301b297158e6146abab85a0558794f99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0159/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 64bf26d1485b530b4c0f3792b3c6a79514bb28b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0160/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 deeff887560fe3da81b2ddb3c940f82995d1c241 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0161/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba538d55aaf6eb1ba891d990d003bb34130715cf Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0162/3081] 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 ef5339d132f3a3ed2309f4e602389a4f7340b337 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0163/3081] 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 b5d1a37eb1c6bafe1785e3bdc784c0245b8b9577 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0164/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 424de6b78f7c4c27bb96ceba3ea519b05be74f85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0165/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 562b5fb86dceecefc511f6299ac8aa913b813d02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0166/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 513e0019ce1773b3d17f84778ee02a3f705f2334 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0167/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 528585f544cfbef5f352d1900c712d6fffaa0c82 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0168/3081] 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 684a6721958c9e6d7948fb1c5c7182b5ef554b28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0169/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f0e346ea56c733d5f5635b2a768ca774f2bb80d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0170/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 26eb1e96583f183698608cf615b87da4ce5f5d3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0171/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c6bb0fab484698151219c7737c22e694d983457e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0172/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5185187cf52f69d1eccc05448aad430e70767e14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0173/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b0990cbf6f004539bf41de38fafc1b4ed41b1408 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0174/3081] 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 ce10ec4af97dda6647580d87744ac7dc0e3a4bbc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0175/3081] 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 fda12e7d957d35d65b5ff01ee0c315b863dafdf6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0176/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9efadecd975795d22ec117978689a89513afac8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0177/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b74eb0654420934a2971974d26b1865aefbdc758 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0178/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e8e31151a0794eefcd66ba9025e3db52e3ef3531 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0179/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fde09b3421cfa313b0e4589823f61f409941ccf2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0180/3081] 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 c9cb9242e70d18123ba8ed6b8a9ad941d3151110 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0181/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7501c86080f293bb8634516a958a53b1b242323d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0182/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f0ef1e2399deb98f7a324f80a5a9e3668fa0c25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0183/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 782e394ba130fed917dbaac5bc4e9f836641a2ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0184/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 13e9f7758fa5f9ecda099547f0800bb16f3aa62a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0185/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 53ab55741af161ba49f31bf309aa8d1ff85afa67 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0186/3081] 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 60c4a189230dbd00b3f4834bde47c365bfadaa68 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0187/3081] 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 40e217967af3d21226a2fe3bdf1f1ea7171453fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0188/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4441804dc3cc008c0e4483d59dfc00a257a70059 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0189/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a9d19e2bb1b62c99d812df06ab75262fa04e8a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0190/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4e26243b5698318b67af03ac30d1be1fc7db2978 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0191/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a3ccb0ef4c5f4b00620c4f4542dc1d09190174f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0192/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 446ab7729513fee8d8becd136b5cabadbdbd85cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0193/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ef8e202f061f930e044cce3dc2573b3cefd9d741 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0194/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 63c1d47a07d0fdc46a52e9f605549ebc86a359db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0195/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ac4b31e2dcdfe5cc7858ca4a63faa082261419ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0196/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b0ea349bcc1bed12bffbf9125829e1a64135e234 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0197/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fa6d84df0652b8d2fb808aa5072232cc97ab897b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0198/3081] 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 f00c33d052a9f4d511d0ffbdb0bf557b9715311c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0199/3081] 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 530bd02b9b0d34e27ac523e810d9cf33e3f2b0a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0200/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8a8e52e6f16e545f3574e6eec9e30e77037c9310 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0201/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4983512a6821f79e2c3538b715d686c8a1ccee22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0202/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ed5d3269a32037d058f5cf62b05803a156787f26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0203/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cf7984bb7b027ceec0a01433e81c26127898057b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0204/3081] 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 dcca73a97ed858c9b1b2b7e7a2b557427dab3ae9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0205/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ce24d1cf962eb4c726862fef6a65dc4d6ba30395 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0206/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f8a44143c1689f4943762e4ede679df1139d89d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0207/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4df1550f38b2990b056862da645fc5fd8d089ed3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0208/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff58c6976dfeaef8db3adfa85d6404f1a715a209 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0209/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 059eb4726a9ae099a547336ae0600adc02c27188 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0210/3081] 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 4715201f393390ee4bc7c6233e56af8cca6caebb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0211/3081] 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 988532ff467fcd301967158f74196f3007ebc889 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0212/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f3aaa2febf5a8a86c86642c8773f2dda4b069601 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0213/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8f1d212afdaab26d73bad0ffcf853255d3fba335 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0214/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2a47723922ca62fa72875c93547964a6f6b36030 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0215/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6e6d7f59cd5c778768b2ccef0f686e360d969c5d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0216/3081] 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 0265912e029c1b23e95b129d6a54a8bda50a97dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0217/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 26d698a65dfe31002271306a9c0f1bbccfd56890 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0218/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eac37d468781c82dacb032671e96f7fd754b4a3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0219/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d85a75f9c5afde526ba96720d133e29e37117246 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0220/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d9a8b3eb77ffd03e6dada27135df770603f10ab3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0221/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9c541263679b68514d2f606804386ca3274213f7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0222/3081] 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 c528d6ec5ba28c4aca92970eac0fcff7ed1c606f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0223/3081] 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 b95f1b26961de2f2e17ed59a5423e6581074dcfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0224/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0896f091a2459ffd7c83de7710c91679a0357d65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0225/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f02c079cb1217deff7463212bc47e2f387313910 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0226/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3eef2da7e63d26ecbac305870030419d84d281dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0227/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2c2c2a1b9079d8225232634cb807ba0b66a7c707 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0228/3081] 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 b2785c81fc85be2d262989b49c288ccdbf6899e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0229/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 abbdb6284bf9d8b4afb4220fe4fca60742ac5ad9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0230/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0aee84bbc5dae81a4121bdc013e718ae0189ff47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0231/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 461054c951649c654fb8f8a99b1798a249b9a453 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0232/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ec0eba4700d498799b1b34f16068f532c49b2a56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0233/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 149c6e1040bc5cde43765c82268a55fb2a9d67a7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0234/3081] 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 ed81e9000df1c9145b08de9ae81d416ffe17fff6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0235/3081] 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 c97c5321d77de9fe13d43e5eb09e1fd6e9b93520 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0236/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 159ca6f153073502e7d72c16f899d1ee265294d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0237/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7cfce4627c2ab8168c6a467fb19b08721270351e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0238/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d4f0298557bb12e76db5a3f3b86f898bfbcc34a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0239/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0f5845833aaf0a1eb3149aeca202076863ad1786 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0240/3081] 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 ae36a2021944e50e9a8484ca6f8579530c6e90eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0241/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9c30b7ab2aeac69b8ad0699e63233f5d43067586 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0242/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 42b0577278b6784a81f6d01c4768623401965c6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0243/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6b4b86115affa5c647c6dc50391bfb80e5504d3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0244/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 45dbdfd602d66b8e8b42e2ba7d68f8473e7bee5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0245/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 558347350fd79fab3e4651fc85756c86f64fcbfe Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0246/3081] 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 62af4f557dc22c811998d03225f70caa974cb7e5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0247/3081] 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 4ef9f85f4a31f143f25f4122c74aed417b5737c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0248/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9914ae2e0f24038956233d10989c457a063ee6ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0249/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a044f625fc568a6fa83cda74c93f4a460d9f595e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0250/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 182ff7fc6dc91d35954cfe6a8a67bfa811350c0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0251/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 507ce31272cc22802e0a7f4cd513e787b56eba8e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0252/3081] 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 9566f2dbd02f00c4489832d7057d4de0f071651b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0253/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1aa3332cb6b34acde843aa198fe5002e09583ab4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0254/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9303ad54922587485027acb732693fd837bf2d65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0255/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c71f552cd4b0526d049f9da7de9520bbcdd42cd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0256/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 69a508ef105abd58cf6b35da9bf673309eef66cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0257/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 458cd9a8728ddb7250fde9adde34a40f0c3dc9c0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0258/3081] 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 918e94ca8543cd661084a067f0f3538ebd8a2409 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0259/3081] 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 1e707ef1d292a335dc7df693853e7b835e97f3e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0260/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9c956c3019088a94c49a8d59e50ee7ac100f8c98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0261/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ed2e58d33f7c217d0557b9c636639c00e3b7f79b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0262/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b290b46915440d51541598f7f27f20bad0e700df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0263/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 77bdb85972d41884392c167b477c93564d906a9e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0264/3081] 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 9e494f4b1288b847a6771fbdf46494d313a9d700 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0265/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 414706a6813c33c74fc104b2821bd8815683c5da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0266/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d4f0e021cd89e2804657d83498ec928bbc1b4cc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0267/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0f29d511a5e71393b962fc78e6d8b69eab0c14e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0268/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fd82037747cb6ffa672d639a25ee0d28775613b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0269/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0e677760615b13492c6093547f4c7d5978eec897 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0270/3081] 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 656f4e79d56ecbb126ce4d01ff91caf202ba308b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0271/3081] 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 fcee4b3420f011340f70f56ee4f16c2025d1810e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0272/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 39c88cf44360208297a15d84805e040fdd53431c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0273/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12b7945c9a3a0b7994e86ba139d95ddf46c39a20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0274/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d19fd303b439f07dd59009a1ed7d6ef21a53e469 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0275/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0358dfdc8dbc3f76694dfde5312e94e7557b54c2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0276/3081] 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 2119f9d0097121f4b0dd7b36cc22d5953298d9a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0277/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 94c4321c4b55a89c0b8e5817e93cd4294450cf77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0278/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 19a89efc9f722eb353f456715a52227e93e6b4c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0279/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 45767713f24ac4ef51d07c3e1d1341179c988fdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0280/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1b7310937bd276756ee17b839abbba3568f86d14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0281/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b27fe1ee43cf7bcde810c1971a877cd3e0e98a5b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0282/3081] 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 bb8623497458213829280b906151bd39b6d61253 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0283/3081] 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 f0bded3888469d44f97ed0fba83c2d69a85acf83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0284/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dc13a7d1ccc103ce9797a3f3de7ac72c64b3f569 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0285/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2e7a6615f3fd25348ae9d8509c5d8346c8e9b9b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0286/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fdfa986b7af97fd73eb0182e8b1dca4308d24e5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0287/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0b1a6e0b29e5bdbb36f805dc20938e26cdacef0c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0288/3081] 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 5176ec4fb89f17ec2c0bb2d7c3c70054cbd78b8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0289/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4726082d94158125d846898ff01e97bd7f69fda0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0290/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d817b46a111ea2e031cc818b85e34eae72a47ec2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0291/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ed8912c244d80734fa59bb4988afd00f9deeca78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0292/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5aa88427ea37c480300469e8c9de7a7d10cb5676 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0293/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6e0198855d263aed37641d9a66b52610583ef918 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0294/3081] 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 c7981e5534bc0101ded6715ad9f40a320ef5824d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0295/3081] 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 41feea579f40dc63f9099047513cc4a7e0c2d3b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0296/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1695a0a607ae4db448874b2601e22cfd00a48a51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0297/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8708841df4d334658b5e40b8160f474b8b233dd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0298/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 992301982beb388fbdede2138e982ad3db510e2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0299/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e9f39de140c4761a97dee02b89ecd727d4b7a397 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0300/3081] 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 60bc3a81fe0dd17412c64800543a2baaf7b65325 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0301/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b9358143eac159c2612297542d7bc27bb95acd4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0302/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 00fbb2d373d2ab7065ad6982cf4b34c5d1ef2294 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0303/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a86a04e5130954138cfa1b5ad7422a7e573b38d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0304/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 06490e4788dc9f0e46d7296593940a181f9d0de1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0305/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c11801dcd8a42e420e5d0e323b388597434febe9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0306/3081] 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 299420465341715b3b628c4dfc9c11fc21a0bc64 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0307/3081] 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 bf5d420c42d81a9d68afc88fd6c7872d70d7b175 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0308/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 daf6d6b693020d721cd71e059cb82257813f9ad1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0309/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 96b46dcbaae5701f0941eef8de114b4ccd40981c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0310/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a340f2771c61e894e3dbcdbcc9d90d142446167b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0311/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fe15321c3e94728f71088672ee0c21c7213c3b9e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0312/3081] 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 4b33aab328889f8cfa4f9201a2e15630c2066d55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0313/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 58098799240ebdf35edf4ac3832ae8aa86777be1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0314/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ae3078bbf5f511cd986cd4c018c05efb4baca60c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0315/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 44cc71ef6c0b4540675972e92ce321bcc0d6865b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0316/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2cfede25c00d9c81f9891206c13a6533d0e50bbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0317/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7faeb2b892f887a01c86eef6de29ed6add6a5fb1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0318/3081] 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 c9c927363b556111ce18ff3ebaa85746a92040b9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0319/3081] 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 67f26a8d69f7cda17303c84e970e3130e717d7a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0320/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2414d9b6550215618d213851596ee0d6f03a9f67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0321/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b6a0caa9e269fde28c3173c34ea518e9d23a04a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0322/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4d38c30e43e84bc0177642e0ac793f600796dcd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0323/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 baee9f1fb94a0006933b2457a9f69f5a1cb04fca Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0324/3081] 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 265614994a9df35a12886de3b9f1f7c040838e92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0325/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 02c38bf3bf8d8e5dde9ef6eb0184b39ffe3f0c85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0326/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c6fb155ea77ca43a64b0f6adb44fdd6fb0fe3e97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0327/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 562acf7e5c40ca8820da0de6d08d8bd57e2a5041 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0328/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e62450a469b1d1bf721ca4c7ba76dd09f750adb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0329/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1acc23df6c9a25c3fe3713d89e0e9a3600ac9877 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0330/3081] 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 ad008d8a1282c074d8c34d43d85c76bea2ebc95b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0331/3081] 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 02157b95d73cc348d1981fcbe919333c31763389 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0332/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dd826c140b96a05b3b5821746a637844d701b63c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0333/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0440a11b65cbfc305aaee4501617e6efa66ca894 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0334/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9392013d02f30e83ed6fc68d64703918ba3a0bb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0335/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e26204416471fb3d952a57eb69f95dc78db61666 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0336/3081] 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 22022da7a24c60726fb00cdcbb0c69d246120b99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0337/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d947be5c5642471945faa2b3f178381d4b59439b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0338/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 55f4fd783108e4252eaa2eccc6a0799276e56b82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0339/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ca83a1048d454dec530ca453c1b966c0219be26a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0340/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de6f848d61fef46211536c10b1dac9c669568af6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0341/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 def7a03abd009359397bf901fa9629150f95fe7e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0342/3081] 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 0cb301629ee42b39bfafb4826576a84feff7785a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0343/3081] 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 3ac6e611213bcb535157c5519ab0d538b6abd02d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0344/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7a3350445743090191cabc02222c6a73f7d15d82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0345/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f3b521d544ac310766ab2dc573af3dbeeeb264a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0346/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0850342bc39b7d08e505c9bfa8f60fb7c436c25c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0347/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 01e3b373e9d480dd8b13473ce712817fa216d1e0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0348/3081] 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 1f911bd527afafebc6fff7c071bec1d50a3ebe60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0349/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7e8fede558af7f86ac997f37a581eaf19863efa2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0350/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 20b5bf1a85a24570ccf211c4dd9abf15dbae6d39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0351/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 979aa96845e695a55c4f64b7dc41c8a32ef2cbb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0352/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 38873e059e8bcf2fea0a3b98e18c0ac07f46aa2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0353/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f69047b4169e1e4af6e9f3f1783c45ee4bb73229 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0354/3081] 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 d737c9f8372606a41ae258ab6b5fe7e858e8c9a1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0355/3081] 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 20683b976d4b233493b6b90e6e3fdde699bcd80b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0356/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2a0bf5850129b1d8774a054fc7cb475af47609bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0357/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 16cee581867e2e39f8ba2266948504b74482673d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0358/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c7ef4b4c1d5cc161004b3115406f838bd293d58d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0359/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2563312f9f2e0536e25111cc034a1a18dcb448d2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0360/3081] 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 b7d27054a7bca0bad7b5a60bbaab6b43374dcc2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0361/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d137a77cd8c7c326fd2d9b36af5540f1830a12f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0362/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c365302ebb638a792014e65d262d653084c25cb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0363/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 26b601d5498b1f3b00095abfeff5085f2f0bd241 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0364/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9af9bc0ec8d0b81309ce6a5ea5dda1c255794ba7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0365/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1f4a8d121a73662dfc85c941f1d802563a1ce5ae Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0366/3081] 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 f42886154e4e261b14e84e030e70ee75d16dc973 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0367/3081] 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 e702c872af53bd5d82139471e4b845d9624f27ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0368/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 efebaea013393926ffe62961567b482178feb3a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0369/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3045466638aea6c8268269c88a1794808885c8ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0370/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c50ae3601694005b6c58d076017f11cce7f78773 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0371/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 79553ec0de7ca863ada1635cba4c71530834660e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0372/3081] 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 3747e44b0cb20978e43c3ea1a1978c3799520b0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0373/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8189a5b3fb008b6b529e3ea3b5612f05ecb9671c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0374/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f5087f22ee89bc5bc4d9f57f5a5619fb3c49c688 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0375/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 81c218bfe1905ef47ec6db9e90ad37f0d2abefaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0376/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1f5059727e0495a701b1caeee83e18a126ac9240 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0377/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3ac4f432efab9ea6c71f596a056da7da394dcccd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0378/3081] 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 a3bb7906e80a5bab0d9f96332c293f9451a830f8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0379/3081] 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 c4bc789e0cbf61d751cc1d53f66fc845d9d3b2bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0380/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7e9a46c93b58bc3376507a625bce1adcd87462f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0381/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f751aecb1f09c57c671a37f02dce3549daf5da41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0382/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 794cfdd4167c9e60b42fef9c91e857459fe7ffde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0383/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e28d2b5ecfbfb2517ab0cad9a5670595403967b7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0384/3081] 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 1638c0f6e8392b08c95e637b206d9e6a62bd4930 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0385/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f5a539301091a864add5bb8ab91ce5464690cbca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0386/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 816c7a7359cc7acd07fe34940be66d47acc11f9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0387/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e1fb307b255fec3c03601f53dbafbbee96542409 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0388/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 adc1c1165be9e600306570ca07e71e8ecea08912 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0389/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ca1c61169d06f707642443ab6d3832df449afd94 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0390/3081] 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 cfd21fbcb3a295ab52dde8b2207d810d325c3d67 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0391/3081] 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 eed4b27195a40b0e666396d702823fe3e08ccd22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0392/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 68da5093efff7adcda402cab97d7e61e80568bcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0393/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c10747eca1d16b4222386b32956cee0358ca0dff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0394/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 857574f5b1e99d7d6ce44acdc08cd49503f85f28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0395/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e85e70e7cb0bff0b60730ef53f405595a6492899 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0396/3081] 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 8f0bf7365c5c845fb43159f57345d2f52dfd742f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0397/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 add338355bfcfa6b12c85649060280cb9acf58d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0398/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d9bcaf0dfcafdaaf3ddc341a944c6ac97f4c626f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0399/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0c54779a0624faeb139fe2ff9d09e067a12fd395 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0400/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1335471fa3c658e735aafd4d510bdd2f586c61d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0401/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9bf061b26a5d6ee49ee02dd399ae93d3687747eb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0402/3081] 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 d22b4196e36b5444251acb0aaa3c099f36bd3a3f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0403/3081] 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 d74eea1454f55d0863016cd93b67223d18453dbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0404/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 52abf4d8e53df6b679c19b98311d456cb2da4a6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0405/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 34183957e963adf6d7cc9bd7bcc37ac25fa90af8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0406/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 97795bd09e542ce8a6771b8ad859b5c461637366 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0407/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9d24ba8f2a65f3ec22a4ae160f4a235cb4c23892 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0408/3081] 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 acac7c6220d90ea0aaaaf0e21562963e99e4aca0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0409/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7a1f7bc2b2f11c6b1f980130632545e0439a7e08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0410/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6ce00b4fe717f8679bd58f48bcab092de48342dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0411/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a3f675b8da4fbab0d64ce4a83de58d24bb9b8f37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0412/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5beda5ecc8fa2b99ec15048c7a61a723d9a24016 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0413/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 13d070525a46e0e09b23fa95361779cd04711795 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0414/3081] 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 664c28c26616992db8850aa76f5cda17bb5d5fed Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0415/3081] 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 1cf0d69e16b9d8744a94f96af44ff1c856356ab5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0416/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b6cdec1cb222c2af9112f96fc2b0164139b6539b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0417/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3de5414fdd247cde2d9c3023d9feead9d8f7b97b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0418/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2c5156d9ba6c07f8feb5858fef804240bebe78b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0419/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c7645dcd10dd611d5219be5e526b1bbc1081041a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0420/3081] 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 06c516ca98c38c189f640038ba16cd1a86b3167d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0421/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 146dcd011dcc4d8e1ef9dec904941bebff9e1add Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0422/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1cc080f1d34ef76a1acaf96c3b48424d29e6bafb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0423/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 62ca11e8571877e53c90f1ee6ee2f8093f249764 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0424/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 613016947b8f3417c66618978e8486a14f2da05b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0425/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f57acee1724b749541f09ee13f38ce41aca90141 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0426/3081] 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 3d8ab5079bf18a76e00813f09b11a51af234992e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0427/3081] 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 58875d483e817ec6efdd7ccbf387cbca53397fbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0428/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 74cbac28edec6c08b906ab970e25165b96697023 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0429/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c5cc3814f53173a9034fc73990544b83bb35822c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0430/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 10a26dab1f444175af788fdd36134d6849cb3170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0431/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 512c2db7759013fc7c44345265470e944adcbe2a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0432/3081] 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 cf3f70b7e221451ad2bee7cda9667567ef2e62ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0433/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cf167e07c6168e629787dac014da46534b6f9781 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0434/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 08757311ec9da6e12a82c0186ed356bfa857a34a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0435/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e3b7842ae2128e7d1187f5fb5c6d23352698f444 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0436/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 caf3073003b2d607e3de4f1d7fe8e9449e2b019f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0437/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 22bebe0efc86425a7a7af89887ada6b05f22b763 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0438/3081] 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 0529f1bde675c204160669a8e7bb55a09c6dec58 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0439/3081] 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 01cb949b0355735e63b61a89064f5a71d0f9ea1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0440/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e00643e68e6fe431d2d395058c2a8aa768c35f84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0441/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dc7a64017a613bdc95c0981f1c7abf129b2cce6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0442/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a133ef5c2f2934879f8c6929238b7bac267fc1b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0443/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8e43bc43232cb046ada50cfc6481c825ae279bf4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0444/3081] 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 31d441fd1d1bc2a80bd883e7f03e893b5e91eec5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0445/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 386007e995767012e05cca4b7f4079cdc71c07c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0446/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a87b61a2b1a9ac04f16c9efd0ee0e203c0fbdc43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0447/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7ce3455e4041c9209e7c9c5be639aced51ebcba0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0448/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cafb3da63b1679d6f02c34334be1617c834eddcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0449/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 02e4fea9f7aefc3a0b0db18294dabdf113f945c3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0450/3081] 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 6a93dcb8548c8971dd8fd09c165852c2ce3f10b3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0451/3081] 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 6e11f2b3728868e5ce13acc91fed037ad4c4ec59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0452/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3de7723534dc81129dc1bd6d5d519b0d437ab209 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0453/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1a37487cba58a4e90a4eb537464bf774e84f9444 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0454/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 da9232a44a37e3f9bfc991b4814faff43c3d54c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0455/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1f977111d2f28be7c8d6f93c4fec115334904215 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0456/3081] 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 276f8f20bcee73b2637e1a8760df89c1a0ab80e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0457/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e6eaedf07783725f4553fdb2835513aee2866d5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0458/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b890cba1967833d734ed2bb4ac1af74c7f7dcad6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0459/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1bd017e8c7a760c855e9d96c75a34116aa187267 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0460/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 45c6923483237d0b4f335c36f45e55b5ea7c9802 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0461/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 87550e149e6d5a3c2e1ccabf8b6c5473293dfc14 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0462/3081] 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 92d90ff9457f429ca5403a7140fef794976a6437 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0463/3081] 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 0607a1c3a63c1c7272723d378beeb5a764cda009 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0464/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a4e639009da1f6b023989f8e434a4c2f376240f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0465/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3b31470711f594819312062fddc36f6a6b148b4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0466/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e74301216821229a57c60491de839e50aa5d9a2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0467/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d02b40ce24e21cace4de2d7d9190ec12a2e02d57 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0468/3081] 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 51417a01be0be1d0940e0a9a4229285e864e4932 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0469/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cab9fc5888dbd7c0b82e0685cb2b3cc72aadb160 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0470/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 237075dc7e97ea0f49d81d8f3bd3331851e6a242 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0471/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a777424bbe8e988508e318d1fc5b048c4817e871 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0472/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f299ebf803be56b5bfc7096ba3cf844b6f7d59fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0473/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0c424c56276d1de9a8371ccbacf5b98436b9f10b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0474/3081] 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 71177d9f2e0ceb978856da92566cdfda44ea90f9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0475/3081] 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 733d192cf6c9ffa51827d927872ffcf676e23d1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0476/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a6c5a8e5690c949bf8408dae7d4b5323fb5434a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0477/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89bd6ffa553170c34854d2198f4b8d92b8982338 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0478/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 21f0eff0730d524302f1906e1a608d286d3d0835 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0479/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d69ab10cee4f3c7721ea7e21d36a8f42669fb1ca Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0480/3081] 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 73174013640ab1ed7c1297f8e7efef061e16ecc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0481/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 42a453529ed619d6e36a741a413d008496e5de9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0482/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4bd44d5f6b9a96bb92900abaebb423fa58a3bc2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0483/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6bb341aaa9fa27634f18b73bc7e8a52f59e807f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0484/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9a56fe94c1d8639eee437bb22da28505f96210c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0485/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d1180f86bc3105522607f0050d298fb86c667c74 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0486/3081] 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 a5fe0be5ce3daa279a1aeb6a4e1ea34607049a3f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0487/3081] 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 2b9ae6a667abaad6a26d815497f963e52dcfd05e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0488/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 07ebd5ffb406f67596d8df084dcdc2bef2c1915b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0489/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8322796b06fb675912d0f77be0e9814697d6e2ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0490/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8be4b05bdb9ff8f4290e48d4b4d6186e6e37cfb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0491/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 25d85da69ed7b183e5b51b2c4f7808b8487d67d8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0492/3081] 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 efed1930a7b0f6f1bb93fd24ce65bad78fb339bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0493/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 102467cc5c0df3dcceefece547f57f183aa1605f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0494/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5595d04a3378a31a9013b6cef2f5bc0b70f51626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0495/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2daa8b34dc7c5593add436d0586bf3d24d9052eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0496/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6cd1c4ae326d046f893b00eb534c74bb628e6e39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0497/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 afa456c621cf8469520017ac29d7d756a760244c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0498/3081] 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 461c3a2b591ccc360cf8fb832f73f48e8a1ec9a3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0499/3081] 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 f245eb5df538e4e95ad1e9f3c0b327e7f4bfb4ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0500/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 256cc94e64d248461ef3ff0b3a92ee45633ae86c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0501/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f97df4ebebc9fa4a390e0c08ad52dfc583074b7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0502/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1d4f087552fd6c198f42cf96c9994e039408dc29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0503/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4e87f0129da9f0d2262ee140b6fc558c6e05cabb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0504/3081] 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 e85fb29842b37f5660cb8f53edd6047f0e2042ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0505/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0808475354f0f36c645437eab1ad570b4768ea41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0506/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0b12a71918f2d3f703f5dbed9a60fbb7df9d5761 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0507/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1379a43481032cb9cd334280ea62fddbd5b81555 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0508/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f3a68e50a679a64c4e93698718134b157d57a32b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0509/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e1e5c46e3c58ffd98536121aaa29128339903701 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0510/3081] 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 46c4c4409f3056b053d7c2bdcec19921e8b67623 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0511/3081] 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 260de15bb1f402864d364c8d472447e4444c5abe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0512/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fba6b3890a7c1f520f7bceb7c51f59312876964c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0513/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 90a75e09f716cc1255d70a615ca6348826adafbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0514/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a3ecbaac2554ede67fe0e0203db85cfa0497be59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0515/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aa113b2fad0e5286e5f46b0daf1cc9490460eeda Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0516/3081] 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 54550af79482926d95d78de5fdbcce3dd4cd3950 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0517/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fca8eaaec296d2aebcf8f57ab61f2177e2da9e25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0518/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89a09563bb2dcbd93490cf212616696d351a0d96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0519/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1b0c1b535533c2166d0ad7ecaebdc1ca75398a24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0520/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 df30b5678c926dcba5d560c68501617ba60bef73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0521/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d93cefe637ffedfff3298ac161f6c861b02d6a45 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0522/3081] 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 593a8c1abe38d4e2d8b63bdb2c687b1ae7e539bc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0523/3081] 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 8e8e3a41408f920ab728e52d46c43896dbb7b193 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0524/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2dcd0bc1a745efb52672f7345cae8077a684b229 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0525/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bb881b69f415963fe095b7adeb8ab7e028a3a66e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0526/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2a61db75a8064378171103e2d06f9de52e73a778 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0527/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bb43f177339a93f7c6718ae3be6065525c0924c5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0528/3081] 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 5c36d3197f4aad85f2798c0e2c5bee1dbdddf547 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0529/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a72ec46b1de225f05f3715d70f39d874ba83db79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0530/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 39fe787b12c4d485ca62a98127ce15fc249b87a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0531/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4ac9d4f9d3caacce27a80c5581e09a196ae24721 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0532/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4955872de3d78184df0abd43126d08b4db3229e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0533/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1675c4150169ddbea5dd60e2d8d61d88bbe359ec Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0534/3081] 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 e90a73a729040c66a9410a0809c06423981f979f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0535/3081] 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 18e7ab1d8af473b793b4f7ced9b94cd7fa59a72a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0536/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 22e042def9cca13257b192922e0a452995cfe800 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0537/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 08f3d76168ba0f3e38552988c6f6a24c88bf6694 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0538/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e5c6e7df69f9d1fbfc4122fa6e700006bc9f0745 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0539/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 759cbe5e1360bc3799bce04625873fcbcb23431a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0540/3081] 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 7aff15122b8679c4f6599a740cb730273c1c9ab6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0541/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5449b7f26d361a1d7e61b21fbaa46c95f58cb33e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0542/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 437873eb0d45efb41624b35a91cc43d1a8c7e696 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0543/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1f1ce1115e3139a5186478e933187bac5d27c399 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0544/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1c07c006b0203c26452222fc4fadbf705f54b341 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0545/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7920bcd0aba2c02e165e6ec4c28a39370bb7a417 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0546/3081] 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 baaaa57d5df4dfb486b5244e89cef38a7b033371 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0547/3081] 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 941d60d8fddfbafe49e6e684c2b8a3fd856fe170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0548/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c710c71a4d5efbec8686b80c2e6b0405b46483bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0549/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d85557cbbff409faecf599459a39d78bd5834f78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0550/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0ced7a76360a518ed4e1544c0e68ffa123d62b5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0551/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 706a275cc4b96ed6b4de8e79dde8e6a8228cb5bb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0552/3081] 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 e0bc15cc3a1440cb92ecc51f47cd3e1a7b1e25ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0553/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5fd289127cb5649a24197a02c74314b94ef2cfaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0554/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c3532cffb23a0eac24f397d9df07fd1603f35fda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0555/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 800829426d93c4b4f3a932ff31917984e4f03b64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0556/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 96cc3812e3705066c7c5606a523834405b66da56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0557/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c4b9460154b6fa79ec5dc179606c74ad79a315e2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0558/3081] 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 7a3491bbcdd25c8fec47d7bea2587296de3a958b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0559/3081] 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 799e3c6d992a4e286c0a7fa98a3d19be6ece156f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0560/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b67123d44115977800efc5be87a99f2660c26318 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0561/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3ee8ea0caa74bb160e8ce2f51d0d048084faacfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0562/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6990ad75f387a7eb9fe89dd56e992a8e45a46506 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0563/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 636e492426335dfd9d0a316f9420fdf2047a04c1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0564/3081] 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 76443db30f7edb50910dba46db49306dd2f5dfef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0565/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0ee8d19c98bfc47cc750504f367187821df1e2bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0566/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 105e305b76511147533e058c29bd2a6e09880909 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0567/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8e8506f07f6d95a2a45100c92040941e15b9e954 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0568/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dc88e0a138da482b62edc615de009e9b64189ddd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0569/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0b7d09aad24d718cf88c03006064fbffae83ecc3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0570/3081] 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 5f4e0f1215ec910cacf0c968afc37dd307b91742 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0571/3081] 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 85c7c15da3fd2de496e55fd55844167328b563fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0572/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 56594344518c1e324b31a41659167476706e1880 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0573/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 156a2acd10239a061a8f29563203d1795fd32f8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0574/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9bd7dc94b1d3d60d22a135df1cb9022e7690feda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0575/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 705080604507848f2ead1fa97e475e5614b33b26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0576/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8d101fbe62c0919814dcfb77290b67171852d08e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0577/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9c6bac6dbba6ab4d569cdab488cc3d8437f7bfe9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0578/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9be9e90789bab8c72f4c723334833444ede91113 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0579/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c3047e9c4c4b11c6c052f672c3f49a5002f8e905 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0580/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2c795ad7529435d6150a9dc31b085f07bdc5e96e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0581/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ac511ff460c0be180d88dfb9092a3940fe140111 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0582/3081] 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 dd9afbb2cfac77be4aa92aa3580b142d98f60888 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0583/3081] 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 010aac739d0efe94e5d2a9318eb04d2cb5aa31bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0584/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 08322dc988dc51f498bbc328168d42197e576d7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0585/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f2c1ba262a51f98710d4b043fb508f62c717b21b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0586/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1f0afe6f61e234732b727eafd11e057cea570c03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0587/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dfaa74949e5ffb4cfbc46c4063c1122e44c22e53 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0588/3081] 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 ec9dd0b4977baaa11697e020e3b792ded07c5b2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0589/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 299b5b6fcdc237dc7f90be189f7170f4136d47c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0590/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9d1a8987158392791f9b1bc0c3aa1d74e60bfef4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0591/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 75283bd67fb6dba5e0f1392d666aa6e58b87d897 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0592/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a2bc9a168f38e758e33ad8e5eb0dea190c43327a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0593/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0edeb253d2b417f3720cf830c1e56af7e5380813 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0594/3081] 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 b06e3c1565d70914bee90ed66400ce5609eb68ce Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0595/3081] 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 4d1d59d5490633401eb5c6b8f86dfb0b848a26c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0596/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bdb723a2f3fa6a9ad47da62e7afbb65cb48b05d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0597/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1df0927a22c266fe1be7e53d1507e16ceb81cc6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0598/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 54b17c65f153e2bba97826e944161175d5ae4bf0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0599/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d175694ae0aa2fb359ebd61816b1ae0fa1248ff8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0600/3081] 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 14f64f3baeb7228f36ae9dc6e12ba9b69f583cd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0601/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 76d5d0d5fb1dbf1bcc7ce224896a629515c32a91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0602/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 29eab8814e0239d422071890dabe99ff7cb52161 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0603/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cb293c5e203ebfa74e05aadaa2de51b8aa401c14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0604/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ecbe092954146d2d03518ba0982daa4eb8545f2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0605/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8229e49366704af329412e3f2d268c13f36789b5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0606/3081] 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 97739e0c1eff46b54c13c4b0a0a81f2343a318f6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0607/3081] 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 feb015a676f8b4cce15bb0cf52a2b86d0affb901 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0608/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4845d007762c151f8b73375e919fd5374d948085 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0609/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5bbd78d914ed0acffdb713396b47e4265edb967a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0610/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 577012e83ab32b8fe1fc13cec81c079148728221 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0611/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1eab9d2cd096eeb2a1d3ece97751fced718253ec Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0612/3081] 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 3bb59b32866f2143f71dab5847c9d0a77c77c0f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0613/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7d97f87ac1ebe273a8d041e58835149261e7c278 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0614/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 380215a6ecdd73c6a27d98de4cf584578965593e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0615/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dc8a5d94e138d55a492c64f20af6059cd072c34d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0616/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6f5d0657eaf39eda2afe71b73f507032f0512886 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0617/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f042d4c1ec8be3b2bc4c487250d27f7b5dee3d4c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0618/3081] 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 d0baab2423ead91924748fa31fbb07a7b11263bf Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0619/3081] 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 b50beb355ba25b75a12f6da38919ca317b22a76c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0620/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0efc03c3ffd1fa4d524c0dc14b602ffe0472910f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0621/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bebcdf94f405737ee209d66a034a575326a71ee1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0622/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9e5b7a21f6c7b010b59479404fd453dbee1317c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0623/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 84bea249f30207291dcdadc022b198cc878ab9e4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0624/3081] 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 73cf864bf842dd9138f4e6bd8cd9fa651327a9f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0625/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a6343289b28f073943816f29de99968976d464f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0626/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1495cc4c623e9cea515d403372c2a3dae418a943 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0627/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f926715df385f5e591e9c69c1c810d77504c7626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0628/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8cfc232f9bf426fb91559009bc0ade378901e320 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0629/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3a592bbcfe5c509781c05847f2f1e5bc98f3828f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0630/3081] 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 5650a324a507ad3a6cee28f4c4263269f71b249d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0631/3081] 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 107411e3d6787aa51fbec3f7af5c149a519d955e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0632/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d8022ab36a04c49bb7baf9ca85504203c0b3ff09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0633/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 319e5ee43d413e043b52018d9cbec5dfc7bdefd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0634/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dcfbd37537ee8aa61953e6b69c2a52b118fb8b2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0635/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f5404e822f2d837ad2890968d31a0dac0a9b7ded Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0636/3081] 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 dafc1183c656535ca287619fcac9431806824127 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0637/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 69902a9872210b2a75c4c042a205be7245c90815 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0638/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7806f46779f68236ce3ac664978ac26aa45417fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0639/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9bf0fcf0305da02f09fdfde619225ce945539a32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0640/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8c5bd4650a0954344168c62600259925000b60e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0641/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6b3a6e79c0fca12831dbb0a50a2267e091aaf1c0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0642/3081] 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 242304b276f2a4447f66abdbce04c90146809485 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0643/3081] 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 cf4d866191fa4285cf3cb80c33402fd3dbe5ace5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0644/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e315109469deda07f4db69f3fc9d6f46d9dc9d96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0645/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 db78f02e03d1b310c476a8ed971b14f0a5126788 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0646/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aad6f047249b9875acbbb29d3e92a33692363e0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0647/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 50fa40685e9875cb375f3ac3160ecd5b9b6c7c9d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0648/3081] 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 6bd41eb036dfbe21eb658848ba9bd98dc8eada8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0649/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c5b145ab01a2243865fe138fb3a95edb15413634 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0650/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6e7d5152b0a9c9ed178637e83e50873c49cb3670 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0651/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b1bc55d8c74e92ab2efb29edf76de440bd740d79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0652/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2a09004cab91c740dd0db317cefc5f75e810f58d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0653/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f09902c2990c5258367f1de1f95dca2ff3fe9547 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0654/3081] 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 84fd5ec702eef535eec812a1066e80e4ef373a10 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0655/3081] 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 bf480939fccf0aef18c21c989272377d2d35339b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0656/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f650a42ba82a892bb1b4f356a3441195bc1a5d03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0657/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2b276ec30eef534d48bd38fcf5024cf913f1c0c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0658/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 54d0f8926948d47c85c71c993226e81898863710 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0659/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e2da3f3ed5fc89b136d0a96abd4f033106a61e24 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0660/3081] 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 ff14b43e1af50e33a8346238915e39ddcf91bac5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0661/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c235bacc942f4a244ff09f95bd4632cdc9c9cf77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0662/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a0a4374af66e073766bc5d3caedad557f83579d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0663/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1c637e1595de76daa63e03215b9f816582145e82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0664/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a00d5784f42b150caa4dd9edc6c5ec8ad6ca5d94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0665/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8056832b81c6a432ebb511d03c81656441e98c1c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0666/3081] 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 0631c68d72f276349c93822df9931e48fca24534 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0667/3081] 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 d73a9f8071754926537d2ae5166c2fc123ee76b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0668/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5e8e503f44c9bace9d6875d0f3fc19342fae6d38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0669/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b936fb02f7156e642ec359e34fef56f4fafdd05c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0670/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b057d4f8d7b2a4b022193e15d4cbe7a8dfff63b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0671/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 05e1333729d77811daa1e845b75bed17962a1b9a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0672/3081] 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 9d43cdba4acea048eab4c7689d0c345b1c5b0c20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0673/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ace201d647e0cf55b6efd35b9b402a8962cc77d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0674/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7a48be9caf6866147abb33193c53448293e9617d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0675/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12e895ce014267716fd2a4e8b10fe4694176b47f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0676/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d5d1a2d05bd505812d411ce8ec92246b95b7a020 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0677/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 52e1c01063ca4ce7107e2287050e86f538f25805 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0678/3081] 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 c9e0633c51762fe5c11e4c9b817bf11f210eea15 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0679/3081] 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 25bf5a7712f6dd5e12305492bc7736f5ffeb922a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0680/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 83c4f39cbdd39d7d6bf08c688578f5d079f46da7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0681/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b166088c5d82dca101fb854054a90796bd9a3af5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0682/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e8fe979eb25c07c7918493dd70142224617a281a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0683/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 526201e829e21d0b017d331b59106f8fc4c33aff Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0684/3081] 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 f111a46de553a6de05c6d217c5fa06d5680716a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0685/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e9f81881c2812380390a06925571f11a52547c23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0686/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5571164e5c3b3146bab780b8efe16cd1ae81c48f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0687/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2cc9d13aa41d44157ac9667391452caa372f5dd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0688/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6ce1cb234d6a8e0cd44d214fedc831ce16e262e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0689/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6267c2510e395465774de0a1270afc8c90704cac Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0690/3081] 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 0e356c78d452e21815cbcdfb06f242972411af4e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0691/3081] 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 c1245bd90ac8023176acdaec7646c55773edc1f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0692/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3bacfa89958f4554ba6fbde3c7e1bfb19ebcbb47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0693/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3cdb82268e961c3bed457fec1b279d3a2e1e829e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0694/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 66ef11d93c2a0514181a1cf4e6e01001f0d606ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0695/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c89e1ebdd0fdd10e30a149a0879d04cb6e53d68a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0696/3081] 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 401d45095646093561b8a00cf320bfc919a08c82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0697/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 55b5f78ceaf73cc0da44ecacead87614f4de15bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0698/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f81e43fad5b2c250fed7f7a87d4901f73fa131f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0699/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b5571cc4637a08a6367dd5b8873896b1660553a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0700/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 af3c914b284ebff4c41cdaa5cf8f1debb9b61393 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0701/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6d37b34b2e6c213c4cdc96b390a9cc11a3aa9bb9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0702/3081] 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 78612426e0bfff53b5b128196c71731e7e8fe7eb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0703/3081] 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 fbb8702b0f1ee3ca73ea93dcfcf68f01b17b7a70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0704/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a1f902855f03841e2ba1f61b6ebbc226b92ee490 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0705/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d687165d67612f8891ffc48ef1947eadf8f388a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0706/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1da77919a0d5a4e6818bcb1f5982ae1d0aede7b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0707/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d48d30852720b91ec29cf9633070f9c45c1aa77b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0708/3081] 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 a1ed095677d0a84b883f016d57d6193ac82f641f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0709/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5e1b77829d1afa59e482b41827fe83b655884acc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0710/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 239b5df2fc508e2ac4336bf6246bc0850cc01294 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0711/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8a01ad43bf83ca0c5b54fd509bf78ba3ce108c28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0712/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aaaa9a9d029bb3066e832f76896411c12ed58930 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0713/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a2329c81a096b464c7ad987dab9f12fb6b7926db Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0714/3081] 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 e004061131057e9e71f2cbe96a2dda1b5d1dabf1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0715/3081] 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 b8f32d94ac4a77f499b1d4e7b66d2730b2b424b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0716/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6f775ee55cd7f7002df0959e4de8020ad4321dfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0717/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 76419530dc107eaa37135df3f17f95e3ffd9e204 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0718/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1a14232bb91ee9660f013396a88181d8a9a50ea2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0719/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fcc10414eab43de0ff4b5c61c673a11dcb60bf43 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0720/3081] 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 236b0a0921db618c2fbd5464f376e7ab5b2cdcd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0721/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bd567bfe75d2053797ba59ee3f4a7beb8e1155dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0722/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8ac002a15c0d965f55b8a6c73fd6805ee5dc9a8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0723/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 69693b392739ddaad9ee3af861984991ae962371 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0724/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5af5bfe97089430261a9fa5311abe163fedb8c75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0725/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 faeaf14a83cc6208a73cdacb04de6000896bea88 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0726/3081] 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 c0fb0daa9847eb0f7cf762e3c414c7f9ba7d4431 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0727/3081] 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 092a83a7a7835e845c9c3990f6c84a44c022785d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0728/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a32d9dfb756c259973499469602ab6eded0f315d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0729/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 78a064b327b73f5b38091eb6331989fdcf2dd6c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0730/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0e26709193effc79d16f8564c946856190e16349 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0731/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1eea8416e9fcc7d7cdd6c5854dab99c1344d24b5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0732/3081] 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 09e233587cbc84583fc7c4172dc5c286fff098b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0733/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5fdac3bb7ea346b6be28e953c27d83c9efcb30ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0734/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 464f338cef0924a919bd2638dbbce848c25e8297 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0735/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 65d85fda67fc532e6128d9a05f8478d57e2bb36e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0736/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c55ab7d2755702a2ca58434bd397843c80e4941f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0737/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 21a1e6996e6044ce945d52162e444b3ec77950ac Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0738/3081] 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 4bc28b0cbdc9c9d15ad732c015347e561b475a66 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0739/3081] 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 b36dcbcb73026811532eff16a0caf130fbc279ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0740/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 217b6db955f27d4a2413bb56dfe31d4e73ae6094 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0741/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 557920e2714d7f3e17ef51173395de4ca926e14d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0742/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6df5936a632f4dcef3d7dc1ae20d18d1d18689d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0743/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 063e1cb1d24a4e586434660d514aff9ff1e1b72e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0744/3081] 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 6f721b2472c3d94a10ff4f40c1108e1a271e47a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0745/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bf7a0d75f57a3d573e9bad2955e234d904ae9429 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0746/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0888f820755c93225c3f55fd41ae9005d3e9730d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0747/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e8e7616744289219b01209b7b55170619fe121e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0748/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ab5940da09980e9dabcef9b0cd90f4fad6ec63c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0749/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 54b08ff1fe59b8ddb2419ee0f3bb403375237d48 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0750/3081] 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 d434d4bd64a54841add666c5bd83279e36f653b6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0751/3081] 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 92c0341fbb503a3f7b16e7f7c5e91cdbcc3ea9c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0752/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 048e3de244e7c1a42c4a0875cf96d9e6cb72cd6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0753/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c16c38fef4193978ec4777691ecfbcd2facd387d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0754/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f182746c5be5a9a5b82ddc16d69a5318e8025bd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0755/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e1793403ed339fde6a086010d24964f53952993b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0756/3081] 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 a6058253d86ad2331434ecde9a62a474f8a64ebc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0757/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ae6d1d432903467239e4706409840e298754b9f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0758/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9a0e71bbb57b1b67850099d493d604a810c83b11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0759/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 22dac3d74e622fe3f5b6ab3398589947c696f585 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0760/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1800cdc75ff51bad0705a50ddce135dfee1dd75d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0761/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c67e25590ce5e01956267b848fefc67f06520dc6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0762/3081] 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 e16daca1aed437a8917f36174cb77fbebd0794df Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0763/3081] 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 e81219cff34b4156e9710a03b86fabc165971cbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0764/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ece5fb5e402d20e23dfa3057d536efb3d0c16a86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0765/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8c8e79ca4f9878f5e56c77381adba9e58ccb7582 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0766/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3c0379ebc90cd250b3dc4a0650ee96edd094c750 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0767/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1d29cdfa634412d900d8ec71dd669ecfa0dc8024 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0768/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c691cf2a53b806f11cd2d4a7276de03763b6e5c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0769/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 24e7af6506fee83a1c5a534fff1c16801f4b57a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0770/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ef0010d41613901dd415cc2afdeb469646f5e51c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0771/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1bd8ae735528067cf180a20c2cb382a144766c1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0772/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b8ee5fe7d8c56de49fc96eabb2d5ab45ea8e8503 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0773/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d9d71d81b015873f7f099a20f6a058f20fddb406 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0774/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba4ea7e2b0fe1d9cb45ae6a6f2528df679137d3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0775/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 06d84d782b6c886724dbfa42acd12ec007edf8aa Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0776/3081] 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 3ca3d5fa94130cf69d8814536c7a0a34b3009729 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0777/3081] 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 4a8cb4df9df770bade645983ba24ee7dd4a0d3a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0778/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9bbcc6fd230ca9a33a5cbdcd5c46052bcb188aaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0779/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3ece595ec0fe761943dee59cd4b3acb6a9c8f5fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0780/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e1abdff2747c3661e4baec6eb2006581b5060d82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0781/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6dc8d417fb292fae5ef16c87982edd8efb21bee5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0782/3081] 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 8f1486da7a57167acf30ff368b977ca21ccfcf77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0783/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1e982ed0e2de263fb207d18f7688db46e3d25134 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0784/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 da2aab56a574a715c1ab351ece823b8695f30a02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0785/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d0a6c52e2d8f1395f809c71795b0f0660761c3ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0786/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2608983e18ada380bc77fa505220ba1d2c748018 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0787/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d69303d005e9ec43b9ba6b62e63ae4560448569b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0788/3081] 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 c5e2b2f6d65a363762ae86fa461c07a03e56e1a7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0789/3081] 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 f8feb211caa895f40237bc56f0e5432854780774 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0790/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 18b8b3a61dc79af8e0bcec10ea9151c4cb67c5bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0791/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8b78123a5252c61435fc2f823729d1e4e0998c9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0792/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b8d701df9725c7204340a9556875052695a7c797 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0793/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0977e4188fe47e36fdffed69c395fcd1ead60129 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0794/3081] 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 854a2a9669318e38c910659c6990f0a2a174c2f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0795/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5a70c316c6d7366d762500e803e55464183a3bd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0796/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c983fb1aa143ea8f2e26154936beced5ae082ccb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0797/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c542dbf862673972ef662e77309911ad9069716d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0798/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba8491c709b4f7f7998c0749ab3c6691ea83669c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0799/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 43a52f1ddf131621b570ecabc90ca1cc617f717a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0800/3081] 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 3da5650feca06884add0a6dc7b4da4100f656fcc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0801/3081] 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 6699c7813077450a78f8ebf90427909ca07d5699 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0802/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b525ae00e198a2346e2e5345b42b9467fdbff54d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0803/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 14ed64cd1cca8945331feb49be03e5efe1c49791 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0804/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cd7b9ecde46067e495db5579789210dbcf7a07f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0805/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e27a3f329aebf13e85534e3a3179397163c9a2a6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0806/3081] 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 6b8ec9dd8dbe819d2c7ef3d5525d88cc723d27ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0807/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6f8f99bb9bb9a85c003ab62ae6056ff5adf55ead Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0808/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 086964785b9c764a29cb6547e61f931dcec2ae6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0809/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 57e4434dc2c0fd0c5384476c974e8bbcc1adbd0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0810/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 515a215a52ae9137ce24ab00b8c3784f388daf32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0811/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d7a1d318279f8bac8ec1b786ad6bf5c3b8445770 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0812/3081] 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 cfca2d1e6459a0909ac1ec7d0f8cb8b6716b6e9d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0813/3081] 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 a09a1cf72dd00d0021d5b8c84a982ce9924c98e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0814/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a00238cf0f41a420164d39a4f2bf903d82744668 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0815/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cbbb87b25e0850f6c636f07d827c8f38714c800c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0816/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 33543bb0a6275006558ea896805a229e7c75b8af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0817/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cf5b3859f36b3ee56e6ed0006536434465d3a766 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0818/3081] 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 25f8afe5a725f5ea96f43850ab6cb9596f215943 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0819/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 05c3b2cbb277611f4b2e054f636f60122d94898d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0820/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c5a55eecd978ab46fdb7168a3a75cd796d99e9b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0821/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1ada32001447e687e05bcb7310e352a8980ece2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0822/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e814ec58d03fb16363762a8b600959f48a1f017d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0823/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e3df1f641ff3084f80be4682f465045cd8064c34 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0824/3081] 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 a3bb8da8373e07bbe11a59e503587e7b7b15ff47 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0825/3081] 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 4ea772bc98ff6f8c87d8e25106824381c34d2834 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0826/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 17370b4a9b98db6c05f7eff007324523b720f9f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0827/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8bc3e9cac1aac190511678bccba76df6c682933e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0828/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f483073842a73bd1c78110dce9f95e37801d32f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0829/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3842e9cebcc34472d6d1c1b1363ab9ec887f8a9f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0830/3081] 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 9ad00567403e1372ce7b23688787be1c2fac4166 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0831/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cd0f77fc3f344950b68b2673cc710e4569979e15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0832/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dfb0d4c16974f6f2368a22fdda61619f88e414ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0833/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dce3f228833209f83e01f33947f75e9e59597524 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0834/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba92ac8bf1cf6af69d2a2db4c1a4d2f8968e5373 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0835/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b204a736d1ec431c0c6b5e8bab88a7fe3da8bd93 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0836/3081] 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 e91fc8719ec4b3e031573ab9a4b60fb23af3b0f1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0837/3081] 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 e06cf4fe447bc0fc1b159ffb04a13b44a087cef9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0838/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a383fd0836294efbeaaa7c4f4c9052a20d4288de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0839/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8315bf94bd9603fc069a73849679b0e3b984988c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0840/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b56eca3ec327558ed23255ec8487a3234c0ba23c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0841/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 500a84213377898c5fb2939d4c6e2de4ee9ccd90 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0842/3081] 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 f9c0c0272261349582ed271ee45837a4d0e62d3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0843/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d8319babcaf38be91b7a54fd0db0c23e7c45ffa9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0844/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d7757b714a4fcf588022c2f3925830b4d3c73e07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0845/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aee72e33e8088271b7c21b765c8e7104d47e2dd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0846/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 133aef0312f86c3d4b3433324b7d1a686a9d2de2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0847/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7f22ddb626c84248dd4007df730b99ab75d629b1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0848/3081] 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 81a61065a9ccba228f78632e2a92b8def53c4653 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0849/3081] 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 c73ee8f192c57991cfdedf8cb5d3b3f624c9f3ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0850/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3821adfbc9d1ec1c740fe214e4ca29647c71ad16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0851/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 22a9ad75c71466a9c7e04bdc86d1bc4900476fd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0852/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1eb027dd058cf11ed8184fb7c21d1d5319a59e91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0853/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 32327eb23f8b05d9354b496782d722ae9c976ef8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0854/3081] 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 55e332c6fd5895fa6f0e51c5b2ab8e6082b8dc48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0855/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a7bac7284d484715ca167e14975157a6224192fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0856/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 564bdc4ed1091dd617a7c8b9f18ad4cf36ef36a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0857/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6bfede321856011fbea0374b47940bc195c6edd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0858/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 447036e150c03bdb8a16b57f7001747783a340a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0859/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d5befb92e4b759d9da4c756fa39ac3d1acaf6749 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0860/3081] 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 2143bde387414d46e1d265669edf1759e975ce72 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0861/3081] 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 5feead1bfa770358200ed84a0aad161806d19406 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0862/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 03cd084f0cca54de3544cb2a4cf9170ca95dd107 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0863/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 792309cd98cb509e8624357bc54c0889bcdd048c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0864/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f4f612e91f856310f26fb6ff60c3e137d4ac657f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0865/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2d1d6a805516360eb7056c1a9e58c4be0e528259 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0866/3081] 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 9016c2ff5a1a305925c351450ee362ee2a5b2a98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0867/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ec20b6ccd3378132d4ae884432b7fdb41efc2aaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0868/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 638b6d60a79f1dc82aa89825be9a9515cc846d69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0869/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 40e0e5e6a929c2661874f8a3261ee89e75a72e00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0870/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 45fa93f5c908d40af5cc7bcdd2e34b42d164f831 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0871/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 35b1a02e5c00780b493d018beb2e69c335a244d3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0872/3081] 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 1ef13989ac5d5779786df4d58a80708f9e2a7afe Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0873/3081] 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 f700f8995082ea5dd56581d463da92caa2ae06ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0874/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7f6faef5a94daa708114e94316809a10d9ec0bde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0875/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f0824c053427fd9fbe0d2b72eeeb7f129ade406f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0876/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e860e60f2870227b8e29dba121d4510fa1c0f1af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0877/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 07d1cabb61244bd7c99cc47b5a316fb59151431f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0878/3081] 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 ef3736c1bdf707661eb376dea49c789bbd12b66e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0879/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e0162d9568784c3b46b96ed20ade9014503252e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0880/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 78c38fbffb44ee5a03a647e75387efa164a7b35d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0881/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eaa3b40387c92ad07e0bdc04f0c389595d4bf54e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0882/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 51e29596acb96e124da3fceaa2b55f4cb1c201f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0883/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bf18430de1cdc8e81b59147cc6dc6d5a052910eb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0884/3081] 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 ab974500a097670cd6fadf27a00e31648699791b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0885/3081] 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 1cd658c12a72c621aea7eb0a3dcd9d6480c8ba63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0886/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fabd1a36d830195f8daa392a9993a32a573d987f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0887/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ee80918cf737a23ca13aa6649a1f39de22ec904d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0888/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3fc5d54cc7771f16205b4fab19b42ccc20ba49bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0889/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6fdb8389ac5a4f05b4ff2f14f378113f2da98af2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0890/3081] 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 f2b81ec92379d59034d83a247ef936b4f3c77514 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0891/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e4679623fa9db5d15b90ef954fba5548538afac5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0892/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8eb96ae7dac61e48cbd4a4efb04bb0aeb3be1bd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0893/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 57412596e174e56d21875b6e33bea230a23d060e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0894/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4201e9588e487357d93c1527034e5fed5aee1baf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0895/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6f6986df69be5e08f5acc965d0aaffd19bd47cd8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0896/3081] 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 5bec4428749886332e98a77d3935e1ae653a6ffa Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0897/3081] 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 744e0fa6df1dc9f63411a67ddc03886cd41cfe17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0898/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0f176e1e849e80d4eadccbd8a8242e41736e7ac3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0899/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff15802b3ba19a0672e1f6bbebb404f1256f71ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0900/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d4c6936670e53d443c0d91d6c578b21457c6e638 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0901/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6f0d765eedec61ad25f673a21b3376095aaae4e1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0902/3081] 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 751a00b25248bd42390fc31c8790785b29316cc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0903/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2ef46aeeb1cbb96190b0dfc4a3fa8953639aef19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0904/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2bc23165a108a1381a2f26b8e24501f697f1b7d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0905/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 05b68594a047f8a1e5664274721d039c5a07a593 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0906/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2b3994ddbd4a26b0be096d03d09f819131ddf2e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0907/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c05481f70b4a734e94fbfcef7f9328edb5c2e2fe Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0908/3081] 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 d301e99b83387c1bcd538108a5ee8f6ef5f72441 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0909/3081] 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 d40cd233575838e26a074a22d0673ed5a3815d68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0910/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 58432ca5666dc303ff6242f311ac06c5e7bfefb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0911/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f73aa31be52b0540382cec9ca253d99189170c9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0912/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b07ffe959dd367f1fb57cc3179356a2dccdea5df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0913/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 afbcba020a615b93d7cc9f80d3395ca51913fca2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0914/3081] 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 233f96580fe956dc2c18e78398c5134953ce8641 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0915/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7e3403e17c53e6584255bf7ee4a9f59136a08095 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0916/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 62d78d9b6f95a6adfbde61106e5347a354ec0a07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0917/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5ef00dcb319ad77efe67cb135b6f6fdfc156a15d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0918/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b6f5755b6fd581351ce47e542845c35b9370888b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0919/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b702ba148cf6a48712762d11466dcdec13bc3bf4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0920/3081] 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 e2cd26ec8fe953e0fbc0f02030ed5acd9932513d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0921/3081] 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 69361132ea65aee5f485ed9eee07798bc05dd08d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0922/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3bd0ead95699c0e6d2d50ed57e9004823384dad6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0923/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5a3684327618e8216e1036af49fc12aa9f55abce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0924/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3d8867a093f65881d3ac3754f8672c5d1c5a56ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0925/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aa2404f367cbf7c758cfcc7251ebbbc050f68197 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0926/3081] 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 8f75c45cd7ed43ee29308664feb8faa0327db7bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0927/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4cd2d250cd5f80f2c45961d13b2031bcc97ab188 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0928/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 db24f44199f344d791cb8b181b58f6e63bd1df84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0929/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3b16879f0263173012325596ed3899e1cb4e92f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0930/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5169a6c38f0aba75ee01f8602c454cd52e5cc5be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0931/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5c71b87b82b98941320f20465c71776911ddda7e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0932/3081] 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 c47b3177026505abedbf60ed57bacd327c3d4693 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0933/3081] 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 fb7f9473656fe24807f28406937fe29a9e685486 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0934/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f5d247396dc2bebe4adddbf4f07531938b72ad9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0935/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ce577e6c3fb9b9b5b4cc4261415d4224afad7e73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0936/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e16562cfb06075ee13a917958a229d337fd44e68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0937/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 430ceec55074d79eb78957c91726fd8b77ea61a6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0938/3081] 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 2f91c6c8a0dbf9c45d4939bb348f5c454f7e5664 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0939/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 90a08a48d8c198eeea91c4ebea7fc366148d674b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0940/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c2bcb3a8baaa107e4e16b93529e12bcdf8399b9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0941/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e326b4f8976252d5f30ce2c9e1b0dbcd3204d902 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0942/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 37c0bf439c9b0f8127604db2b4c56ab7810ad912 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0943/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 869a1a30c25b6e2eee2fce10e6120bbdeda9e192 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0944/3081] 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 3463b9224f95177268de00d8b67e02bf390f783e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0945/3081] 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 a35584aa159133499ac33967babc515031c9c4a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0946/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5047348e32eac9b6f8eccb5ad524e88c9213d3ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0947/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ccfd97b172ecdb1323611dfa65df7221e6c8e5e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0948/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a105a47384f81afbda65039e614645a9d829785 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0949/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f1cff59f6181d4037da20f125308953535ec04a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0950/3081] 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 8fbbad2d6a350f2f595134a920cade080f719448 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0951/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0bc9c543dbb0029b3059ccbaac767e0b9ea1c306 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0952/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b219ebd4a840c6a0c9beafb8686e3c684c6b954b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0953/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 43057b3ad65262113578a26f1bab530a6a078b28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0954/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 384c8d45f2f75b7069635e3ca88aa5cac6b7facb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0955/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0317fc851e9511512faf13dbd5ef7abf8f57b176 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0956/3081] 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 34169d1bc5a2e6821c52bd3f3bc77cd3feb2d5fd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0957/3081] 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 b9f8fdadbca3472033a6984df28bc72cd8268d8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0958/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f82cd44f4e7744ceb533adbb6b3121c5168278a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0959/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e20fe2714aab6e89661c2e5a72b2bdb9f3da2dce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0960/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 606b1f58506cdbda16dbbc302e19f6110f824cdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0961/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 569a1363569f2ae470a9adeee06e0b4675afb484 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0962/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8b4a79a52b6b8f015754bdc4d3280150675a3626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0963/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 897e22a61c7ce4830dfb3d3a1cdd2f1820cf6dd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0964/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7bce388dcae4a402b78b4bf5c90cfd63106a5bdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0965/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e551a6bd27e8103aaaf8474c4abbc14c47dc70a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0966/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89fb28ee376db278a98d8c2dcca00d8b1915e6ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0967/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a2849e6e919b32c27ac7bf59c33a36b0f176aaa3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0968/3081] 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 7e6eab3a0c3854200fc83873833fa59a35ba6230 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0969/3081] 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 ead9b1b283076ad0122fce5169daf7f8802cdd81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0970/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 81b2b903921095d9aa3ceeb25dbbc202bdc5a795 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0971/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f990f035bcb3599b0e9c1eb1125eb75baddf5bb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0972/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 36dc68cbbf4e38aeb8e0d7ed59bce23093aacb6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0973/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 45da52eb13369a4b4a92916e924ed8d9c19b4e62 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0974/3081] 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 9c71a73df4883d74ea76be100cc1d92f8814a469 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0975/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7397712bc38c5302965950e1bc4df746acdcdf3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0976/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 16cc2c12f9bf220628005c38d659ede77954f37d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0977/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4f3bc5632d5170f85465eff6df3104df70e12394 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0978/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 87bd3c604bf74c375dd00f212073df8444f56545 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0979/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a76c6160a6d52f206a017621ead683ad713ff4f3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0980/3081] 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 8668861d5b9566ae7d6c343d3444bcf6eeb5cabe Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0981/3081] 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 a42d44a23862f9ca79e742607cfc4f3100a41b49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0982/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c85ca6c7187a865bc024a82bceb301501246787a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0983/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 113bfefcac85c5cac5347b1ce8d65cb5588b7341 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0984/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0de8e4ba7cde99dc032a70053f82b7fbb3bea206 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0985/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3a936231d30b380e55c73dc3afcf799efff4b5e2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0986/3081] 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 5c2877f59c34766fe886e07c38e10ddd0f200a97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0987/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dd1ecf995e00f227bd69ac77424d78e04c1d064e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0988/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c63d8287aef57804b6655d92d50948401b18c076 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0989/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a522622b896d928204d32774b483089dfe8986e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0990/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b3a33e71582d2108bb38e45a9ba86900c5b23ad7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0991/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aaec805f994a7e3629e51428f33a0663df256fe9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 0992/3081] 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 2b2cb6fb947a7a02bd1ff9f4c0b16b404dd873b7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 0993/3081] 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 de0ed14b9fdb2f0d2d055e17d96944a33709a7c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0994/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f4b95c067d7f1cf263a5c53b862d091c22a1984a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0995/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 23563715eacedff79b8398a31b00983d0f17f8a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0996/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2f0a30553d62b2f40d9b6a8e2d2fada34c124c1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0997/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b330e09a874fb0752b7a344fb768910100664c9b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 0998/3081] 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 133c788e2c2b42d6272b1b7b5118753c88df5bf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 0999/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 85e942486c4d2883946a657c2f24398996ec6800 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1000/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 27b121caf0ff32a320951c28fc14bb9d69c6d987 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1001/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dd624102784922b5925e42282dbbea156f433da6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1002/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b53c96607e4183a24db287a4f28832ede5ed8745 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1003/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 736d908a28a187615d86b5633b128e33d1c5eac3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1004/3081] 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 98bd63f182e339a4acf8de7e9244be4a8c5264c0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1005/3081] 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 068ff687671ea9a9f9806dfa61973d9255a29957 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1006/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4d8dd12f0eacd677b2e6178787c75392d3d484db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1007/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 519f681583881c54a771c5875ad87e953fd7a6eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1008/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 128724a92d67317764afe0c03bc12fe6103e3ab2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1009/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 30850f98c652e9cf19eb90b4836237f02d8c90e7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1010/3081] 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 ddd833842386b4613983a7c65e52027a3e3cb7db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1011/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3c52474058cb6fc536345c2e5838dd8c72d83465 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1012/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ce03b0fa25841fdd11fe14ee97dacff470bc9fe2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1013/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 15bd6ec5d3d3af5d0a2a762b1f61138d6a120d18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1014/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4b024df5bf7d2b394db31657bda95cb5fe4a8ea1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1015/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1129825478931b76e7661f65cea7017d9f04c5bb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1016/3081] 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 7dfd2d4cb73e66150e978125dbf72fdfc75e079c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1017/3081] 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 e676226cc6304bdc5a43e4bf29112fa2422fb3eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1018/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 615e59b2ccaaf4f5ba98cd566d54bc2a7846785f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1019/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0cb3e085d06986a6cc6fa50528a73a4fc6a3802d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1020/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 91d6fc620c5effff6b18d47968af0c5d088d5d11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1021/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 edd5634c0eea436c92ca72a18a7c069e384f4136 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1022/3081] 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 0570dfb1d06c9b7371a31b575998452466de4ed9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1023/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ac54d54d99f8acd23904c68b545fd3e806a2b2ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1024/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2d61d80795eb7e69451b621d11bc3dca750d61d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1025/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 189c674514b229cdd2e2ff99ee25f2a3f36ed9cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1026/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6d822fc1345d4af07f5bf941fdf6d02e1eb6fe18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1027/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ab2060c6932da32959b74119b8b63b5c2da04830 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1028/3081] 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 f836408739455deb4c1a416c98314327a0ad81d8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1029/3081] 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 22ab9197cb59427bdde5e66d577fd2e36cbe9f0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1030/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 14310478112826cd684f09b499c3fc372321e4d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1031/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c96314d1eb5ffcfadd65bbd7ceb026f8096efbe6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1032/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 49d96ed64b2b8b6890fccdda3da0bbe9b5a04573 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1033/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8ddca5710a4a20fff9a445be20c41927f1ca2d3e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1034/3081] 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 2ea14e16ef430b45ca258b5405d754091ce187de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1035/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 30dc0d34bd79331ed11702e4d1aea82075341115 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1036/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 64b6d726fd146a656e493bbe276431906d1ccf57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1037/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5ce6ef62394c4859e0e10087beda068995e8f063 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1038/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bd57d9c6f2f5e535572b876ae1938c0e5fea3c1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1039/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ad885a68eb3e68f6bdccf51e8f26bb6f8965d697 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1040/3081] 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 fe1d64f879e764450a9344096d03aeadf4c00aa8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1041/3081] 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 271d534b260779740f7c41c78596042bc1cdfb3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1042/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 05e5e5bf66cef5cb75ae7858049ad1c68f3cc13a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1043/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d01837737011c33e5207c7650b3553c225eec0df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1044/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 64a1f25ac8b2577f41c83f65ab07fdca127e054b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1045/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ad2fb71da57f1392a47d6269c429bbbdf3626d03 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1046/3081] 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 2fe102ce79e6c9cfa2ff8f5a244901fa69d223d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1047/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4380490860fb760804d91e3ac5139ed17495bd34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1048/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1a0ef1c31cc76742379807e2dc5428b1aa75230d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1049/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 333c05ad967d79b12ac2c12a200016eeaf94d01a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1050/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e2311a2524ea8e588b9f6ad238d0f08885974c29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1051/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b7a13bcef3af643b8720bc02e7732f0c5385db3f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1052/3081] 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 65b56d979ea10619b8507dadb53c3f8de78fe621 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1053/3081] 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 1e1073bff70d008546f7a8e8d36890eb4423280b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1054/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 51d5e9df55c9321e44af0dd833a0acc305b35082 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1055/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d9469b502bafe6ee6e00809c16a32db4ad05fe4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1056/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0c5e066bf92d35adee075d91de3fd704c4acb7a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1057/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aae86c473c5c7be7ceb7bdc9a391a460a8126aab Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1058/3081] 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 0358d0c2724ae3fdaf19191233512f58f88f8491 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1059/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ad7200405b5f2ddb5252b1e0a653a5e3a26ba403 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1060/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ae924eadf32cedc633bfb3e5dba0e9cd29d4479f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1061/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c24c01b0c05446e9d40fad16335a742e2e92c3f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1062/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8802174f0f9e7ecceb7b860a32dfda2a3c27f792 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1063/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6aebc06a80722e56ba4d805c7999e58808079d16 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1064/3081] 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 c359ef74d64ce70353714af05799a30db0d5d57b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1065/3081] 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 d8aa0707cbbaf67390203b8e16bea457772ff742 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1066/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8f703755c562d9205745a98489b36e3dd3cd9bd1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1067/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d091dff378505abcfd83c0355cdcca7f1bfb5df5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1068/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 56ccb8d62e5f086dcfdf46fcb963e5a4a356fc53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1069/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8535017178e9b8ba56ced16e7b0e1fd3f559bae0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1070/3081] 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 f2dad3751fe53b5d04c25b3bf7a7c6e1592b919a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1071/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ac09352caece9c42ba802c0c81d5bf6f33b7452a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1072/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fb6e6a5e0359ba6765c87c12ac0fdf31cdfaa5be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1073/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e4d9dadfd406b9f5b909583b2b35530f5fa9f2b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1074/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 886a0160a0102c2dc171519b7a6a1d6745195ddd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1075/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a00b808b139dd367beac4118ede6ebd18996f241 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1076/3081] 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 0c9c25cd353f2fb372525b2a9f7f4103b7deccbd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1077/3081] 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 75d60180528cfe2b0023e886bd31ca81f166e022 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1078/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d7b27b3dc49275ac59c2eadd702b603bd077b5a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1079/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9bf160c175edd92dffb99cad27394e9ad1c1991c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1080/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e7f1e6c5007eb97f3b44f3d0532e9fbaaf613728 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1081/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ae122e9352f69fd6915003bfaeaa00fa365a4dae Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1082/3081] 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 b864602f38aec7b21adcf77e405a1a11d519e6de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1083/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 72c14a3763bf3e0d52240a19b8cfdfbcf3626caa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1084/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f474a5eea8cb4a81c1a656e80ae948a718aa1689 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1085/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f62a02b4d330a19c51f621a44d80ad193034bc7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1086/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 789fd28447b0fec7578e6a482b7a82e1b47ff40f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1087/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 43881ffdcc5f84ff3724362f1571fa332745340f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1088/3081] 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 b98f05164e53b4eb6c81f733bc211ba75ab55725 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1089/3081] 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 f2250d2e4d8d5413f9fb1b822bf6fa93cd7a5abd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1090/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3822e7138853843735c23388990ec19cee495a78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1091/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aaca4d978aea2eb180a1ded69aba5247122c8452 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1092/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d2036549a64c1b1d1ede6d95364171b4c649376d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1093/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b873daf578c875a9377656876a6fd40a2f5ea363 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1094/3081] 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 7b7a7afdbae6b1590f16f5fc2e4c4467b0e47e86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1095/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 efa29df94a1f551b01221d482584525e7755ffb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1096/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f6c0fc8057998c3d148673fc6b8646d387ae7cef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1097/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3972ca610db746576d552c23227cb4b41a759667 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1098/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6828937c08924888216fe7d5b5ec79e87cf4437f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1099/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12d31567b0e220f8db4e099133a500b546113284 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1100/3081] 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 4f14bbe4f75fe58d6487c85ce65648c89f1b8eee Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1101/3081] 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 37ae15b63b1fc4b120af5e1343d95eae94675935 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1102/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4207e114f7342417f7521d0e812e5c1f74d881c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1103/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 015fe4d90487b8606334a32aea34ef44b88ff927 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1104/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 88486046f144670ad9fe21fd1f73ed040b007bf3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1105/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 794ab54540180b7ce674e0e3db0a31267fb4ca4e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1106/3081] 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 39c3e10417287f4697f8ca9df4a4e1394c92c053 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1107/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1fd1c19455d84e00a4027fe18b39a4d11f3fc338 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1108/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 219adbf821b51bfc0cb029c6ce04c7f651a4c418 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1109/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0568d53944aff8dd1f56909b45915c39bc8ab8a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1110/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f7870370ef3dff25768d5b13859ae743839984e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1111/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 42b23736591de540d18ec28a5e608922eb65a1b2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1112/3081] 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 6063757f0c65bf3cffddbb690af47b9011ce6f2b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1113/3081] 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 57b7695ec4c9d63e74b0a71beb32e8c40223149a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1114/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f9932f7a0f7dba61cf7c6a43afdab2077a5b73f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1115/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2817a47a8ffc39637ca74e338136d1e8a7dca945 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1116/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89cbb8eace0fa70ef493917a57c1aac8e4af82af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1117/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e91c6a1fea703db3fe2ac81d69e89f52955e1edc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1118/3081] 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 23206d640887954ff19148d692eb0a808914b880 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1119/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e9873f0b23ae747af750ee59974a9e3d0cc6a9f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1120/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 582e83fdf0492c3ae5058f3593bd619635a86b03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1121/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6567ef87081ab2a7905852e919e81310d46d99aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1122/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9a2ddd0a3d5532da40075ee3d8e9081e23704faa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1123/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 38ddadf6296eee8bcb12af7f71e5a81e8d08c762 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1124/3081] 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 af7b0f3b0defb20319bc70e4189f7b82527b9c20 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1125/3081] 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 d8aaf8a8f31495198ed7729ad7229536dcd4887c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1126/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ecc2e15d15686a051c8b82ab0c8cfd38d361eaca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1127/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a5f398c7e83b9a9847a37d9b25864c734660a084 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1128/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3c82e2cd1959bac540993c25d7e289f946356403 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1129/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 039eaaddf1b67435bd996063916ea3f212575d87 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1130/3081] 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 a2f2f94e2151c15e7df3cd919b5546aba22105d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1131/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 79eb3aa97891f11629661e26f87416a76d2a76e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1132/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7ab07a30d895a9ec58c66c61abf39bf7e6e73897 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1133/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f393a0af504a385fe891aebfaa3501cb798243e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1134/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 755e025b7b0b06d54fe0ff0ea51bda55f8431ccb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1135/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0d21155c502f5da97ec88a7f6869054768238f23 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1136/3081] 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 06bd1761a5283682bf2aa118b5881e534fad719b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1137/3081] 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 64411abd4627877e2e36b1908da6013cc8159fa2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1138/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4c80caa1add1a9bd85c2872bd455f299c3cf7e89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1139/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 574e08c6160eea2e849197b24600210f6b24667a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1140/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9c2d05ce4891f246c88a25b11b8118eaf3a7286f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1141/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 58a04b038dcd2bbc518603f998a38630a6a2d922 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1142/3081] 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 520f457f5de213d68cc74e0f1940da631dbb8f3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1143/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0d25f1c6271811a5d14b58f2fad5c60de3d10b5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1144/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c5b1b13f2fbf5bb845e5e48710b58f5a04f72784 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1145/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dcc4db39e4d0535468b899c11e10c93d2b840afa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1146/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4fcb89feaf55d5ae28a95e134c176ad8b7fc756b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1147/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5ecc4c988bfd90a98b17eec1612a5018cdda904d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1148/3081] 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 74ab4a49287b6ef4c26ac6afbf9d8e71c3193189 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1149/3081] 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 f7b33d38f81f4d7ea3b9e2a5f8f299f5a717c5d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1150/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f783a02a6ace5b5a24d3889c3c0b091ea4b86ea0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1151/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fc2061f0899348a9b0f394aeb3d47bee76bfc603 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1152/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2ff00adafe5b52711d4d8778975fa295dca83e11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1153/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 79ef57da2eebddfd26ce4f4416ec89561f1d39c1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1154/3081] 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 f4a9a63a2b2920e328a3cb02749315780e02eacf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1155/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fc06758a2d6c122acae51880cb4401727e1fccbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1156/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8855dc0a8ec6e888cc73aa4d2782d42cbd5ea1cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1157/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2c580010c418f558a1072a5cfaa19dd774e945fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1158/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 07558e59b3318ab14aefc9440d99e595aeb2f5a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1159/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1f9e8759dc31bb57cd9aa5f51af297b36290dd31 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1160/3081] 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 47b3c721a4854d43e47d6adb3d2e6c8291691684 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1161/3081] 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 008ed03a98dcf69b7c42f88ae8cf933f1b4d61e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1162/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e612c286bdfc196e41fdf9c8fff69fadb7c589cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1163/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 42a6e127f15844c857cda871ee2bbabb01dc8cfa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1164/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 57d7e5a9d1f9a0203ad4c01beac5344259c7b57e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1165/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cf88b45193bcfacc9d1594a9b59cac35ca667c8f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1166/3081] 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 ceeb9fca8a91461437f289c531088232ef8dab95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1167/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7e058381c9ef38cfea7dc3e603be00a5c4af9b12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1168/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cb34b4666b30258d46688b1cc0584afc1ced66d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1169/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7790430b9c8af879a6bd8da83bbb2bf9003bd7a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1170/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 29ac8c6132187c39e6a2c14f54cffc76e8fdb70d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1171/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a74b6aa9bbb62c18ceb8ecb4ad0709e3049ea7b2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1172/3081] 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 854c904388fb0f0a3bd04818d4d6d7415ec136eb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1173/3081] 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 46704f37658a2d79d5408010749191c4f1fd0b57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1174/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8b16cbbbae0dffae8335c04ab65eac6b01520783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1175/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dbea110a4fe50da566678c481123710e9f8c1a1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1176/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3c58e2afbd601f93a5101c839b31378f23cad97a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1177/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 54c6cc7e272bf8c40b07b25cc2c86165477b8c84 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1178/3081] 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 0cbfb62c9e848e06cb40f20e2218a36b030af754 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1179/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f3fac16a06f0bfa2160b025bae90c33d6482dc10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1180/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 06da425e28d6d7cf9dfdf24e978ee3be5fad60d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1181/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7f74c71d119b4e522c61af3773a8834d7775adfa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1182/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f077387d27507b0da67865d6dedf82d1de0c126 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1183/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e7b73aa3919896a3ea93e93d25e4c4fa25650f68 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1184/3081] 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 92f19154352d2d18d15da8711cb531fe30105d4f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1185/3081] 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 5b63f02b8936abe4331c758021aa6bd27bca62fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1186/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0104ebb4190da96c5ed797bdf0eb717aa2cf84d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1187/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 88de26b03a14959cfb2dd7aff779e19544848ae0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1188/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4328f94431a73dd9db2b10735a003f79833926f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1189/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9ba98d8e10f14e9471b998d2ab875aa55c488997 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1190/3081] 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 5701950daf63e366197abf02925447965eb4bb9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1191/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ddc7d16f518978e419ed39d110b20d23ff856040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1192/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ed66eba0f8d9fcb6ce13d6f0fde53fc8989eb04b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1193/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5349faf7f9c5c5d2925f1f77779e126983799ab3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1194/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ac5feda048a16a3ad09ae39567c2a61584a8f093 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1195/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c240e8837435e5856c13eb2708b59752dff853fd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1196/3081] 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 3747a95c666f828c7e87b63aec2987e4e7a07786 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1197/3081] 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 846c4289f4965a3f7aca04e650f6dd3d3bf173a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1198/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9d89da2c8621c8c4464c84758b8f4f39c47baad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1199/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 67feb349dcf7d43bf915129720392cd2ded430ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1200/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e7cc741e068f10175d8fafb90a6af809affc04de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1201/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 88e5b89c512e99753271a53a3e73fd1d865fc042 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1202/3081] 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 841bd965a0c65d443660f62707e37ed9ef2c1099 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1203/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5ed7ec528da4277e695efb2d21807ffe4801f54e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1204/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d0c324ab04df9450614dbd0dfb95588f293b9d49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1205/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ead9d5e7c25b883549567e470c421041360db8cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1206/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 650988069317cf964fa8092391027c1e36fa3b3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1207/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b5e45341932fd0af59e2789e92484b9c8e2708c7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1208/3081] 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 cab6f33383c66616b547d182f1eccaf19f135d0f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1209/3081] 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 3778b41816521eaf8de7c4cc9c496320d061ea10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1210/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 41e3097e508f0446ef726bda5d06d0116d7898b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1211/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bdc70bd25bcb4e5d0aa920d17fd1abe8f2418fb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1212/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ad84a611dd2ab8cfb545b193a58d3263958a2059 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1213/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ec067257d03e4dbd4f4465fbfe3e3c844c2b5df0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1214/3081] 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 11d6c179498efedbcbf3231f21d7e1e4dcb952b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1215/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2d927841589035a7869e4c5aa36aa4989eaa9936 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1216/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 27f2400b5a1110a27d86db7455a4e3da4a3cac5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1217/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b92fa7fd033ed711ba8288ff428ed4d9af177a43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1218/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3f82e6fce33de743f3071e406ab1ec96c9a50e5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1219/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4f8eb0c96a7a86bb3c48db2135c38540f6b651ac Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1220/3081] 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 7d236adee8ed85be040392dd114de5c24519fc93 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1221/3081] 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 99cfad494b611eff32164ca4c00a6790e03a5fd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1222/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6cc1de4a73e9af0a5d501b0666be437192c2df30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1223/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 90b0540a07c8eb1631b915a590704f56839864f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1224/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9ba8e908a3aac6f676975af88729efb2d2952df7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1225/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 24f2df167c8fe7d025c10f0518cccb99ecaa9839 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1226/3081] 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 16040e816c276b917066e90c3aea7599a2e63010 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1227/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9bf8fae2354e5e7ed9c1a2c0514d14421b0bf9e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1228/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 49b1be93f06c51fc282499494613463398b284a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1229/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a6ffd68bf206026ff1aa6d568e0b2c228967e281 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1230/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c0c327d31e2f2e7766bc6e244485a88e195cef9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1231/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e764c44108ec6c82c9e5da2086729197eeca3a95 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1232/3081] 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 137c49de2a404d411190f1ea3366ef176e5b045f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1233/3081] 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 23aaf96484a3c16c1502a91aa54b140d80ce36d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1234/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 539c215a1c2f11efb531f95d32a55126918db70d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1235/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9ef5124cbbc00bb3e0ff9abd6c082102070317dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1236/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aa1769eaf28398e7da2c2873f205b6bb93e77a2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1237/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bff3feb198d18729e2f068783d2ead290234e52f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1238/3081] 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 c5d466dbb48841619224a00c8a94a34baf08e347 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1239/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7682bb88cf3ed042a071a8680f922c503ede1e47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1240/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3ebed23fe2985dd40560e6c6e6595c2d19ce54f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1241/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 032b728f6a4638dd9ff8c9cd4bbaa38e15d8a506 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1242/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 63f878b0f091549977f48b733228e4ed34537136 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1243/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9b9638ed1cf4845d0ba5d278f7b32dc8d7fd8a4d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1244/3081] 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 285059d9f22e6dae9c550e3a11d5537ed87240ef Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1245/3081] 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 071cfe681e39d363deb08bca87dcbd50defa4354 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1246/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bee1f7e663b9e6eed15332b3a88beaf36d23ee03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1247/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7da8e4899c6e8006299bb1d5ed4d8ad956efd90d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1248/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d6095bff9bd1af291f6c3c25db35fe0775695729 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1249/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c7a0c7d668b651414fd9d1c0ecc31fb42c49dad0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1250/3081] 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 abe72f760bc8fb1cfc90be91f6958a125161d5f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1251/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bb7ce12a9bb260001a8035c0bc30d6d711a880bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1252/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 26508c753531502c59b8f4a8139f40e1ac146f6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1253/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a6d196cdf4c74be32935a224d94aaaa28eec18cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1254/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0643b4d49f4753a17900b33a46953778c5ffa5e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1255/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89f27c62a4699b74655ed318d542f0394358f0df Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1256/3081] 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 f14a0b16034746c28159ab7098f5d92da4f2f504 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1257/3081] 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 3955d2b02284304d57ae153392880d5253f89161 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1258/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f01b430aac766161647d623014c3d815dd4b8287 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1259/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0d9d273361f0cb9becd118e9bba85ae4ec977e97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1260/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4ce77728e7f834862b7e22d5372d1048526208b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1261/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cb90846460357e5dc69dba32223c291d676186ec Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1262/3081] 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 ef1ce622cf633061bf86aa5a3ab892b08cf3470e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1263/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c7ff0d6b36bfc95e7f7700c8396816a492e12ff9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1264/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 13019aea867752fcbb26475098f082d28f97f1bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1265/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 afb80858b02778ed37a3b6054a84abaffe656c7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1266/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9cc93ff9807bf5f342bdd968a488bf61bd1047b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1267/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2fa645b3cfd5fbcea9d0f7f07e20ab75298355fd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1268/3081] 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 1305119c1a7a2278eabb1347432ea37f1965006b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1269/3081] 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 d319fbf0344a85e54f14434dad5c21187b81102c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1270/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b0081590867748c59647b1ced68ee1a0d5e8c0c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1271/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1bd30f199058dc2b29927436d62240da6e838f5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1272/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 05de665b54e87e75dcd9b9442e579a95196bac28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1273/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8096fbfe0a06436aece5a135a75a1c0f76aa9728 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1274/3081] 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 210941d226bfd27555d7d393e99a9a133365544b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1275/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de55aec44465c7814e3a4207fb2ed7ce3522ed30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1276/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a13c97d69af0e7f3a091de43d829d7895b9a0407 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1277/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7b8b0e5f193d9d4eefbcdd7b8ea96042fed8ca06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1278/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 51d839f7bec352e4beef0f7739af225c67e9cfaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1279/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c533f27a2d5cbe177986fc0476618dfa2a4e122d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1280/3081] 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 2546f16e88c046b07579cd33c942a67fd25e644b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1281/3081] 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 df7a2bbda64e4f13dbe9e51a5c98dc7753fbe54d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1282/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e4dea8ce82633614bf9d4c83cc931e0165492cbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1283/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5ebcdef9eb39c6d2ae4976aa3c36c0c594c81750 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1284/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6f91d4992bc8c88dd9f821ee29805702b3d3b9d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1285/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3d8119bfe5396245975f43a18464542fa3040d9d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1286/3081] 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 97514dc1db630ea7265dd6db504acd79e4a8b32e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1287/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1d149da7da61dfe69e779898a65a2493cbdea7ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1288/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e41aee33355c4f66c84b4b816800dc10e3bc1048 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1289/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b4ac4fe8e3fdf014cd47c0a7115d91757918063b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1290/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f7e927d49b6dd1db9e5915c7b1d7745e9e51c1aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1291/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d23d04d058f2a26c0a08effa9ce31b2125c42786 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1292/3081] 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 fd7857f460daa26356855d3c2e511ac4f33490d7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1293/3081] 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 155a9f6b9cc9e7815e680d4655d5a264ee4c2498 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1294/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 56ee2fa44a1b0e431e694092ea02dabdccfb8d8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1295/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f05e38e4e669e0bc4eee331c20dfc624002efb65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1296/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 63f9e001577127844b9a4376447d98ef6c38e5e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1297/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 efd37c96c6e7b906b21ef1280925c10a634f4510 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1298/3081] 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 9349a3df435d035b4b652d1d4bc73e630807751d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1299/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 67b111e3672812960447d5d4b234b1deb03930cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1300/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b50d373e78d006977600d9cdba564ab7a74c3607 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1301/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f981e9b66e71f3c06feb01cf16e0e80f8b0d0741 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1302/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 94ec4a8ca4d6551e327f42b5fe97969316292941 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1303/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 465f8ad83e7f4dfa1ae561314d8d4877419ca96b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1304/3081] 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 c91bb015b6e6662036af5304f2b72d29d6df203c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1305/3081] 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 801b1f2ef280b156b15193397346a06715b3d909 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1306/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cf5d01190510b29240bbe5c2f602a36656edf480 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1307/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f7cff21353a113c557a02bb3765d65060e6deddc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1308/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9aad1e07e2e9fbecb4d4c9f55f134b733b43c92e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1309/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3bb94055353cbf46a1b8ebae70df133b1b3cbe87 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1310/3081] 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 07ba1dad2f1fc3ac5ad1c2a70f3979762c0c0c01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1311/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d1b9f4e8ad7a4ef01aa583362425734475dae0f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1312/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ef33d9aff4d19790615c4603404f918c87365a4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1313/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 274c55e51c041871a242358f7256593a7ed2125d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1314/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f3811cc8661ea0ebaee3cbbbf8f50a34b758a60c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1315/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0464759308d31747f60f6ec1a26c39d6e756bf47 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1316/3081] 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 3a93c31ebfa72ecde90e5eea54dae55c9873f641 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1317/3081] 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 e382a645641f7d57df94450c03118f594d8b6c4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1318/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b2d8c64947e96da6b0f655ba1b89e48f402067ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1319/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c2793b9b9827c922b91d40407e318690f268d496 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1320/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e5d81d5b590c705e2b176786e6929302c5004f0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1321/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 187379c680c4bf9aa0d422163a5da0c2baa6f829 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1322/3081] 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 5e949eff627ee2d4262951e972708767bc29d543 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1323/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 efba271ec9cd47464424478259a9bf89dd816203 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1324/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6311aa6ac7f978790f51bac3d8441a06ee5e209a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1325/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c3e59f5c316e69fb87d9d3f01f82308271f72503 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1326/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5495c99ca9e742f569a38df7a875874e70fc5024 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1327/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bda9a414201e7ad7d1b5a7dc7798f473cc4ac2bd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1328/3081] 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 4ec60ab99f12c8971ee4a411d8f12925653de229 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1329/3081] 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 24f89c5698e593cca086c625f5112bc1d9c38c55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1330/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cf309bebcb90e7e0a3ef0be4ba4640921f5ea2e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1331/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 40ca6bc142c8a203fa62ffdb3d542cf1a896d1ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1332/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2b6c6ad4adeaf917b933b13af2747dd9f9cdb5cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1333/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 824162bd4d04b6c3bb50f15e04e3167d13b56224 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1334/3081] 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 a217486f0c1fc66e391c4983a5603ea5a0ef5329 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1335/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6d3bd81a43867752c3b17a25b54e1f292be0f26e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1336/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7fa39b3ff746d25169c46c0113659e3082793866 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1337/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 37f8d5cf43f68646fd2a6c041306613540364ce1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1338/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8c705cd5c1d13dda541d61fbea4f99d10b05a4ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1339/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f58516c1c101394bdae415fdb380f0c08c6703a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1340/3081] 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 a12fc7aa88b64638f842ddcf90fd75ac2e1e3f10 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1341/3081] 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 f961a1c39ff9a291ba32a4f9fa7505ec1ea2a502 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1342/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ab4e49717060bfd922d62da466af882992625485 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1343/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 465ce50fb7367ae4257809f33ecbdcfe68c467b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1344/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cedd373bdc7dffd6eb82420c0f45693cc34ae06f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1345/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 119d82902d26ed44e5e799daed02ed226c1ef97b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1346/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 90e9c9bf8f027e73d95e6d09758be64a76c0cb46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1347/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5348539e5ff46ce61a41f24f60612252331c138d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1348/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 388d56b6fbe666301e782490e9298daea9fc042e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1349/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 58ce7c5038b979b1438e6fb0fd9b775c36294574 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1350/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8fde743ab781e47b76b83090c4d87b8a24a9f6b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1351/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 94f340f0aed0ac6c39ff35370b0bfb5ad9365eb0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1352/3081] 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 9384755f151a0fcfcbf4412ea5700991c11c2d5b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1353/3081] 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 e76dce0ecdced171f29f2fc78ba86b37d2c5b03b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1354/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de8829a9fe483ab197800de8331ec0132d67a503 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1355/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1483cd7ed9efb8fe5c19e9a237ff4c9571c2f639 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1356/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 82fcaf5a1370df0132dbfe18291a47a4bf3c158c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1357/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12e128b524842def25855c34a3fa7624a242b143 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1358/3081] 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 19b534dcee9f53041acd595dac452443ba30d1ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1359/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 049365cf081cce08175b419cef59fb99acf58a46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1360/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3c7f90a0aac62ff4f7aaca340a7d81c0e1e67660 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1361/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d71d512067858f7638d959e87bb1e4e00647e570 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1362/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c4ca574276d61d6bac95a83ee778210444193ec7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1363/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 313a6d617c1e6be467f98976876e84ae4ccfdaaf Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1364/3081] 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 b5010e48fc4399edac4ab5cda72f57531fa6eb56 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1365/3081] 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 be11bc707643d5237e01f80b8c715f39b7e42945 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1366/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 57488bd7b3e90498d8ad80e09bb4132760a5c4f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1367/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8a090cc8d5e932269cddcb4a2d23593f1bcc1da7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1368/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 894ffb66bf513aa61947c578d91910fc0d51e642 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1369/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fabaac75b9efe13ef0c1516d5617e6f3bfd9e341 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1370/3081] 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 40f97809d03356d1ed30a5f7096b50df38504a32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1371/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 64af3810dc5e5a8c530f54710291a2573359166c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1372/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b5963a9ec494a888cdce6ff352e339408b5a1cb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1373/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3ab95cd2296441c7c4c172bdac9f93b5c342fc43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1374/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 78ea3b317d2578848a67608669a729cb77e89801 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1375/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 99350353392c80a96c8adb1cc5155f03dd12e64e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1376/3081] 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 2915c69b79d3262da6235074a45abe1819f266fc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1377/3081] 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 3a57076555d3f2d5dfefc1bd43d78339ac6891e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1378/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b62804a6cf28aa1f46388d040f41929f6aaf2f75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1379/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f55733c1b93ff4ea14a42e1854382ddbca65fbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1380/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7764ab59122ee6a07b2547daf2ed7b779065316f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1381/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3895cf028bd2cba1b46fdef9ca6d12dea570c899 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1382/3081] 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 8c1ee6d66dfaddb8cfcf1b569665452c6fbcb3f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1383/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f96ae557c846f92f793071a26c6209ac15e5390e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1384/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e7242b9305683509ec745d69c6f57a1106b60594 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1385/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a32a32ff4a61d64924f7f825994174695f07f7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1386/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f85b2ed9a8c77fab3c68b76255e2074122ec71d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1387/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 31760f8a514f2d9a2f8b0bd364c9dffff2abd7f7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1388/3081] 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 e5548032d1e4560ae5143d62763d194fc3decdd8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1389/3081] 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 76a96c9f7b09d5eed6e88bf67ce731cf567144dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1390/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a839ddcc6b19de39510e9f8c1ebf36f97c5f9d76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1391/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3f38c5bfbf713fee6c9371b300bc8e5c09c3926f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1392/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d9a9251ee4bf8da87ce1b3e080c334577c09c702 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1393/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e89aa9ab456178425be4783e394e637ee78a4dc3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1394/3081] 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 171f66437ffe5b951164725c447b6892d15942af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1395/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 33fec2d687328f3114c517c4baebb7e76b7c4434 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1396/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a819f99f03da50476257fd88b3b3133d9663941d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1397/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e6c227b71c2fd251ea249bf2161327b74d14f174 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1398/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3737b3f0fc4a52609e465e2fdbe416879ee12377 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1399/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ad1575aacacac0b8f03ac95b6cf24f184df3bd0c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1400/3081] 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 637332bf32f8aa91613784535a36a249042e3cea Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1401/3081] 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 a71e8778be0c2a9e112a921c77e778c1b7b12ba6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1402/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 be3234660eaed3cf779eb04b22379b5e00961c27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1403/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0abbbcdb70d9d6275ac7945b083702c5724f317a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1404/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 04e3bc7629c298e559d8ac0fb6cb1aa9381f3a8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1405/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 68f3928e2ddd7c38ab1daaea44dfeb9ea75524f7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1406/3081] 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 606315d797e3223ef026df873e1cd7f98b36dbd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1407/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ec57bdb7a1d573b6739329f49cc9667a9fc3e551 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1408/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3b8e6d138cdf1099fd1e74deea88872fdf87a68a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1409/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fafbde94f46b944fe942a08dfbe59d1a3dbb4755 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1410/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0293dfd838a242bbdfb2ac25f64bb809d20e3b4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1411/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 68e53c8e5237992a88c45dc0752bfd867b868c95 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1412/3081] 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 07e92a6d72a4a6dc4a68bdc30affd5257db74fbc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1413/3081] 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 79aebd50e3283b905f2ac1bbffc3264cbd4997f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1414/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5a1ecab4270886c50f21ce03f49464d6f4dfe264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1415/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5728c9d88dfcf31da15c367b7eec5bc3aa50cc10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1416/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 49b9963d6b5a720628ec3e493a8dc51c68f8a9a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1417/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5a6269770cc8c0ef09786414e580bc1185f832bb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1418/3081] 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 15c212e74765faac6de001eed2270c32015ad678 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1419/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cebc73412477e32ee566811d984a78d131c2473c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1420/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0fa64a51850592714f0091d4641ab8afec11caf7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1421/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a704be63c5c78d16a50ee0561bb7fc6196caa96f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1422/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 73802f779d59e63caad8d0272f01bfef63127cc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1423/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 193bbce227cda4fc683c37ef8805de972a52ada9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1424/3081] 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 2588a68d04c1a39c433a398f317423d59a585250 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1425/3081] 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 5ef0d174e2257848e5bda49a5e8ec44083315f0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1426/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c837e072f97f3f910bc5a299f7d5a24f5bd0a96f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1427/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 197dd7cde6f6f4f41b5d8be8fa9b4b27a1563b5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1428/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0bcb04669ff68366b1644ad3264bdfba2531b17a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1429/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3453dad6abc698c8e65ed6ce9393a6f908f05283 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1430/3081] 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 32c6232eaa125ee4cfb5573c6064d3813fdd7e5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1431/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 068b8bb7c999cf094c7c80f446f62856e30bd521 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1432/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a5b55e301a24cc115bff8a179b0c6259a795fec3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1433/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d3748497fcaf72e8403606862370dc004903084d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1434/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7cfcdf6214210e4e2356f68518dcc395a4675f24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1435/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cb78225705fdb7c04d0b8ae2a79d3753a45bc683 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1436/3081] 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 6bc2cb8b984cf51577fe27a3af099275416203b3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1437/3081] 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 a2402f22e8549661af0289b811df2d7f18c635d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1438/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6dd64a062e6816effc6d5a594d83c8533f641eb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1439/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6a40cdc388f601dba156d4cf285731eae8323216 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1440/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bb247e3ed065cb1c0be9c11ad51549155b5aaec3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1441/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 caa18bffc46ad5fc3015f8f9cc3cb87391d3c039 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1442/3081] 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 67ed94970c01bea6c8cb13832333af360fa5d17c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1443/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f329755fe44935e1cf34f438b0dbc629a16b4e7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1444/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ce133f58021339163f7eb6c0f91fb2a7166e87aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1445/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1671a30d02ab315745190ee769e901180a45b066 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1446/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5a358dbd62dd08f5911ef32c10d6af1771183327 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1447/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 63997f509bfdbe75b6caf20f84ee9dc37391955d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1448/3081] 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 fa5dff263aedb5f5a40f2c2e61d90081b6c09e2d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1449/3081] 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 cc16e09201066920c7bb2d5b276029b50aef1a24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1450/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 44ed6f9fa176eda6ebc2cdaf7c57d0190bd4625c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1451/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6505a0665853f0739f3a64558032b3ee0ef22804 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1452/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b3ffbccd6fca1d2f680d92f96cc1a3cd6f5ebb62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1453/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e0b2b9bdee63ee874562da978c4467c5ced64bcb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1454/3081] 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 040911a7f9eb8e802676c47acfbbaf439bd9a7ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1455/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f4694691ed18edde9dcbab979350e42cb03d5c84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1456/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f4c46fc29079526f31a6e794f9309eb40fc5812c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1457/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6bf7dc42c8073e52494e1a5623dd1fc683911aa8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1458/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de368d185aa3284e1c332c677344902e32d37175 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1459/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 59c1bdb74218dd708a97ebf04adc3c366ebfec81 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1460/3081] 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 9bdb1203d36fca3a171d964360a865674363d6d7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1461/3081] 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 d031f1b6948a54a65bc3041211aca99620ffc009 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1462/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 257bb31e4ffddc1d6b547d58ac5700014109b278 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1463/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 41ab1530e1d95d07203b48ecbadf4ae02544e79f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1464/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d6fde4625894a195152625ff6e964138affebc63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1465/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 205282dc2293a25687deb89f28a0f8b98199243f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1466/3081] 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 fbb725099381a84a53971ef80a0c5d88a9044b35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1467/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c773f35bd92bf56466753476c8d83c154d0e9d80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1468/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e2de252eb5fc93f220037c92ff37bd15da36dff9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1469/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4f309cc1e5782dbf00f81468194963fb602a9474 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1470/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 57a64d3c2f464e8623cc8239edd9dd9e579d2b2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1471/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bc340ea94f6bf2a6281447ca7417bd851a976ed8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1472/3081] 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 ea03955d66f9ef7a06cb1bfcf44c6f37c0b4ab4b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1473/3081] 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 fd071e54f0173fee03d7fb3c2e94b6a36ed2e1f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1474/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2cd173297af027a2e7b086da3b12a2dcd7dc8faa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1475/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 911fb00fb06b9a8716d661c5f10810ff2292f596 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1476/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b8ca9f076332398b2ec88e725609d561d7f47bf1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1477/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2e0421513ab4092ac65eca59f53eb1f79a17433f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1478/3081] 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 c88a29425d2b30a79ed9eeaa57ffe638d307399e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1479/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 99f01e0d7d780dab86d771b51289c469bb36bb01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1480/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bef89e1dd5d90dde6c3e1304494181db37500399 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1481/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d0c6b5bc87dbf92ce378b4e6469d5b4fc30dba2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1482/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2e56e6ec81bcc6196bbb2c5fe03f3c6d9e502f08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1483/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 58a943df5b4a11eea4fc81dab1bce9ca179c37e2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1484/3081] 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 639f30a654ef6253ea997edadc9274ba32675a3b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1485/3081] 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 c13c99cac0414bffb89f69326da78a21d607f7c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1486/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c167300855e2b522148ba744417df65eb9cebd2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1487/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bd13baee7cc2c38abb4ac87a43089044d7e7905a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1488/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2a2b56bc43d87f018308403e53bccaa03027d2cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1489/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 71a81c0f33c81e7bc27f7705dbdeb8e87585bd2a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1490/3081] 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 8bb1e6e03dce858a846b2e3bcbb26d82638de863 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1491/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 230bb677d3dfab80c3c9cb4f8eeb771f1958322b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1492/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f17dd1b3284f4e59a6d7e294ca1c485143bd205c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1493/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ed66f8fd120d75914d745b8032ec66742f43061e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1494/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0c8cb2a747502eed8b28e852d4d864d3d55f5f2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1495/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 207468687412f8b531b2bdfd2411dd59d54aac46 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1496/3081] 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 c4b17b95869e558a13dbbd88544969875c557edf Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1497/3081] 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 4e96cb98a115fe9001eae6b9eee59a90207b2cc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1498/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 623272fa07f5e6299e15fd65baaa238b810387c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1499/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e683cebea38952061dbc116af7a2c99733d9d72d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1500/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 33fcd3cd1ce79c8dcfe6ca9956b75fc4fc61d479 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1501/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 909d2240d4512dbdecb14b419481134abe9e50b6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1502/3081] 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 8fd0027d8c6ca7f154e1ba6040388bc16389b349 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1503/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d83cba7238d86bb4b83b8c2535d53feb25eb2873 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1504/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8fdcfeb5e0c792df2439f25ea056f1c33a5eff21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1505/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 041cca5436012ed55645eb90d706cf193d7fc14b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1506/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4b0598aab35d3e719fa6419ccd9874308eafd627 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1507/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fcd572d72f74968dd892ce9da7fe47a9bda2a730 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1508/3081] 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 2bc02559b47a9130a5735d608bc918e869c654d5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1509/3081] 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 b26c3d1bf7293c4bea4da0a1b791b8f69d4d1323 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1510/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 133d7f3b5923941b66468201792afeca409aa1f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1511/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1ecbc82e568a61443965e5a72a5367eadb831793 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1512/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c2209ba26489665040d4251ad1d5592e06ef1a0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1513/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 28ad39b0c788be475bbd13d2dcdc427375b966f0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1514/3081] 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 c54ffb02a76fa6e348b71788986b7072d39f67bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1515/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c86fb33f2ff7992e4f46f8f7350e5d604ba0e8b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1516/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6d4bd5e3f9bf0467aff4b084605d5b4ed482895a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1517/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 56fe6ad382fb3ea9ac5c6de3c8d1a8ca6ad0140f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1518/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e06fd3699fd6ba87a8758b3c6bf3af63e8361b08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1519/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e052a93a8adae25d4e81ae560423a37b5ea5c630 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1520/3081] 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 109e41e39918d48e2e10c1b6f55800e9d73244f4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1521/3081] 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 ec529487e34fda75f3e5a9193a049a8eb49fa8fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1522/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 beb32562a77b4d4eb82bc519f60447c105fb0ced Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1523/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f11c74e9b1c155de229e74211805b58d7f3bd216 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1524/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9fd1adf272f31d8a67fe4a1312fefabf70fe0216 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1525/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7a9397b1931118b88353d8cb7c809f0bb9d885b3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1526/3081] 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 1a7b1ff18062f900026addb2983904ba3aca2816 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1527/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a2084ca5d298374dd9e5a4bd392940bf2f1c001 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1528/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2bd2e55c7b0917834b4b963bf70ae824b8dfdc0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1529/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba652715689be75b89e9f52390bae1204bd5be2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1530/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 984b692a8a0cf51be2a8f0ed34fa08c6b91fca0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1531/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 059f11656f1840fecebf88e789b06774bc7a0168 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1532/3081] 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 9acd835d4065a1523c12391ef2bb842b79fbbd7b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1533/3081] 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 6e00c8a7888c39001f163a4a617d0d62ec7d96bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1534/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 720ce8e3b0ee0a20529c15a5000924f08208ed36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1535/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c052f1009c07c4b32e1e6ab220e087b6765c050c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1536/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2e2e29730a2f8ab95a0ff86bc1554a249b14b7d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1537/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2374cca11cd95ceeb730bc98e500352d535a5cb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1538/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6bba29a34fc5f4ca8abf82df166de323e45a8cf1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1539/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 78cc1a0d14e0da06cd23de9bf78b5bc02a078378 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1540/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9936a71cfa619feb75e00551458cffb227e9f1b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1541/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 78d7e47f255ff72ff91512a593703ada45e96485 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1542/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9dfaa92ff73d9f701c7376ee76cb8e5f9a93f032 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1543/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 47be5858bce02a79990bdb3a15eff8c0efbc7083 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1544/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eeeabc3b3a61469beb4cb370e4e2918d17cbbfe2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1545/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 937826de57571532337460027baa9e2abede5246 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1546/3081] 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 99193bb4d78e1d925f5a29035ca9fa6605f6e041 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1547/3081] 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 e9ca931400d568b77667da6a503c4f5e64992831 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1548/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12804a33bc9d3f64588c9ff894cd8e6ac9e8649a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1549/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3d46961501e64abaebab069bf1299628eeb0f8c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1550/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b35c86a39b30e99b6e594eb63ae0dc38eca5bd57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1551/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b8df6f8594db1c8994b680bdee955cd65426e3c7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1552/3081] 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 81496169cfaa40fe1f66f8b15a4822a0f066a450 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1553/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 50d8cd588a4a2c67e27a038995ce19ccae01090b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1554/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 90868a7982287307138fd4e00d27b1e15c73c2f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1555/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 92a26b06823247b1f3b4898856a9e2803113c787 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1556/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e9017802b3c7bd6ea08717886a9685d2f2809885 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1557/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 02c866989c67740ff8f38531b7a296c7b508634a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1558/3081] 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 6e24d54431c0c7d48a1c77f949c5bb3c2bcd01bb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1559/3081] 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 d33f8cc054d09638cf562b6e8c5704a194066239 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1560/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2345da18c34f9fc0bbc5708b330830218405136e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1561/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b4d472ba74031a6dd9fb3fa2581cfda86a2d2453 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1562/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b45eeedf1278a2cb32c14a55ddb0d80fafb4e46e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1563/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1ecc164bc7aa73707bcfd51ac9a5095b0405f8d4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1564/3081] 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 8cee21db525928f4ccead76027e2fffe0bf5705c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1565/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dfb5596b995617891ede84b4b8d96bb9b15396ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1566/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bd45ddc179b1f0d2af450c3eee7d71d0fdd2d742 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1567/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 08413d7ca71006901e914fc61c3b50489aa5f1cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1568/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 66b9285b16fa0bc835a45732f43229d9127cb36a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1569/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c00678a28595da3d92c9ab18baca3c34d15ba9cb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1570/3081] 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 ec011351a9ad816804c5c6b5bf4dbed9e64a75dc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1571/3081] 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 6b9a33e89ade3312757df9023ec33e4b9b2b3f03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1572/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 61467f2b715afea9571a87085829f526f9fd1f4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1573/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89899e9107fb88558d81cd68f030fbf47c2e8c64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1574/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f8142bb72e4266d7233e3aab2b27f9f069731a00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1575/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7966a551c49ecbd80b26c8bcbc744c0f50ac2dca Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1576/3081] 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 6d9563445fcada92705d5f5fe52aee562763877f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1577/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c0bf3945b1ac87f484dbc85978f3f0a05002a0fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1578/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8105d5018902f3dc57e2873fd86ce14070cd4cba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1579/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89a0aadbd7dd797ea6c687cd2ab700e53dc76f0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1580/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 307712277f858a5803aae08fc4da20f557947b14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1581/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89ab5e1cba6ee69ed10bd29f3ee473f92ad3ecdd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1582/3081] 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 3de0d620f7dbb12c4c3fe94f87249c9e5907fb82 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1583/3081] 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 127563df5f7d1c306b8c3dc7a3246e1cc556d502 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1584/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c705a9030973ed123c28f8d6cea95acc09fda730 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1585/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d81c27dcbb1876349827d70d9f393e74abc2cb2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1586/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3393849342ef5bdf23b32f8d495e8d945817c009 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1587/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cbb6c8c6aed128848455ed32cfe5979aa37d84f5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1588/3081] 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 559916cf134029be737852d57cc90bb465f9c352 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1589/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e6653fed4b8e5a6e1ed8d46c6ea8dd9fe795f365 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1590/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6401173dc8d855ec1c35a5e987aff4d72c052512 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1591/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 11b8460ef3d9443f05c844c3bd49fd836a6ce7f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1592/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 44fcbb17e47ee759e45090eb97390ff55410be23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1593/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12dfcfd9225e1cb2a56de2b65ecc6887520219ec Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1594/3081] 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 049479282936d0fb2cb2ad319b171fdca497fb80 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1595/3081] 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 49415eefe2594db1ca92a4a38c67f1a566c8dc68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1596/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 32e75f07f6e22c14a88a4413fa858d2c2d0ddd36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1597/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7c0cbba167d5df444c28f94159252b50075cbf2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1598/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 61a2094b81bbbf195ec4649f5cddb405c2afab33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1599/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 39811dc035013849703672616dc3f5f1ef06e800 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1600/3081] 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 02813609539175229d517c1ef8e25cbddd7e34ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1601/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 503a3a4465450b3547a590b79d3e1933b1bf0062 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1602/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 09ed30f07e42f7c9666d653f35b3af70ce150839 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1603/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 159a30f6568df3233ad8c340ab4a556f41f31b70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1604/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4c85f3ff05fcbebd2d3d2806f6adbafe74a528bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1605/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 64472ee88bff64b7c3268d90b3864340b1f76e7a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1606/3081] 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 face1e7520a5949c4a51bcb60b252dec8af0fb4e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1607/3081] 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 548854ed50de627c2149216f6231a98588a0b4c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1608/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 676c237558d8576758d1711fd26aa00d8e658f28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1609/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 beb679a5c57e54fa40237d7a3e703b5c252247e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1610/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c1bc3eee14879f253d5cff9c18186daa797526e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1611/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a65a732c44783718efbd296b2791a31f717bf07c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1612/3081] 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 1a06ff9260f62f8e246446655b093def8ca272c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1613/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f0463e9e4d081a1ffa8dd2e2ec291598ade427d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1614/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba786420a52eb6d85b7b7fbe57f90d07f101611a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1615/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2134f84a6ff097d78cc732f7bc2315cfe6e6b0d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1616/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dae9fb7f1d65cb6a20d7756c763a9d6807cc12a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1617/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0f02a675c7d4e917578a4ac31f24b4b602bd9ae4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1618/3081] 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 fd4c0355055ebbc449e1d041c10f42c3bc96a121 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1619/3081] 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 7dd59b111815da84ed5d9bf06748f65fceae3526 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1620/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9ea31c5d54b606fc3883ca369c6b285dc7d2ed2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1621/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f98d8186ce5721774ca5c61d76c7b60eae68c74f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1622/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 271489b5a58f1e5ad5cca8261fb315ee67122d9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1623/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8dc7c185cadc0cd9c1075d24e93a6e5176f209a5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1624/3081] 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 9f55eda8e6af441c887a140b78c32110b3577f6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1625/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2b07aded1a001cfdc3fa61d9e65d19280a5bba0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1626/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 10c4d21c992d838a44efe50f396e26dd4f701a69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1627/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6cb0c3a4768df797cdd61f4fc59e29481039fd2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1628/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6305835a075923c015bc7559045ddd5b6d503d40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1629/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 01768c10aad479a919db00d455293b4243fc7d8d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1630/3081] 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 bb2dbc93398508e5f1887481a9b8332f637407df Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1631/3081] 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 88d5a0ba4cfd2f9a52b316701df622513fb4ea25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1632/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 54b2dd0d28c0824fd725a3fa955aa8e2246e2316 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1633/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2d0b13c9944609b3b4d8c5e1bdd22f1908522849 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1634/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ab608153b8fe983a99cabacf9c13e0b9f925d36d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1635/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4cb772fdc282ada661d3da156911a5b93bb4e0da Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1636/3081] 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 5414dd5edc7fde1d1093a28357aa6a42e6f68326 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1637/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e948b91c7c4c1b98b6e75ac4ec95afa167810f79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1638/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6a2abeb5c39ede46d6460eb10d68a7150488947e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1639/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 81eaf24dd134cb43d6cf0e30627eed95031e7b84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1640/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6a9200fd75e8668ae747bff58e289994e4286646 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1641/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ca08071b46775513dc1ac80a5ed680530e5b36bd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1642/3081] 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 08b363fec74f3ad152bab447c42f6e66e806cc4b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1643/3081] 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 4b77174cbb086197186e21bb3c01dff4680cff21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1644/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2c903219691cba2630188536b9f00ed9e14268e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1645/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aad6e6200899def67240c9eb349a5e63235172f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1646/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89a0bb862e9eabefd417d4c564371c2ddc2e00a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1647/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 510fb1201e3f440ed7ac14732e5548226b097252 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1648/3081] 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 da75c8494c2a52fe5c3cf8e7cc50f00ab0c66c71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1649/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 608eafa67c0b21c9bca22edb6a6be8a823c4c559 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1650/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 28eadf76e7c2fa708dfd8cc65b0defa3a0f61c4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1651/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fdbb48b6aa1d7d2ac0422792e70bcfd4d03d8e1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1652/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dacf0cf7c74707fa9b6511f84e922aff4b87e41d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1653/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 97db55f9944353ad706c73a74316b2bb5f2b4ac1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1654/3081] 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 b3048c3b65d552c95808f5d55ab744f23eaaa01d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1655/3081] 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 4c4a7523e43d7cde9de84842460502c9f467f2e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1656/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 beb2142a02b5d5d0d6b1d125f893671901920105 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1657/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dd24c3b0e0330ab805ae433528f5d922a02b78be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1658/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6964a97b75d3ad1a9d7afc5c4958d0cac809e851 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1659/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d5dbe13d3c77417d85d99a5c06dfc06ccc53b247 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1660/3081] 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 3e3bbe0ec29a3d9a2b116f370aa98a82a6612b50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1661/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 91c6ee6c7bda312daa17698426529eecd7f078bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1662/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9d38242fa1ef45f53e501f9fa927c5437819fe97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1663/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 67becd679b759b44f2ae5535b3fe12f9586cdae9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1664/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f6f9e2332afcc28e18fb3ae14a21b7efa117d177 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1665/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3c46469be45c699c1c41b2cc11cf7113c21a6950 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1666/3081] 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 a5dfd1a3755c3e229d74592182fe41f9ac9b02b9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1667/3081] 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 8f2f952b0b470bf96933a16e7df15fbee60b971e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1668/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 39219fa245efe9d4146aef3d8297aa4212f8755d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1669/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ebfa52b68ea4740eb98292fc1871d00d453a0279 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1670/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ca6cda0b4f9fc9a982688825d39fc5fe82db04fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1671/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 651a8207ba8b91f0d84a5e6e1035339e01bb4224 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1672/3081] 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 d921dbed2f8bb951524b63cd669a60666a8c9231 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1673/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 70c63cc6f33b1f8b0adb43fa6c72c4366db07fa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1674/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b5c652cbcae6f0c7c33144c87a35e059b7fea2d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1675/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e7a0a88ecbcec1aa686d1956f438aadf4e062d0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1676/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b843e4a2d4d02a32d8078cc91b527935962d6848 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1677/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e655d0e9e3909acc885e4dba613d520a04feacf6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1678/3081] 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 4f82d96671281320f60b49b91636b9aba237c7d7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1679/3081] 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 44b42e0e644977bd07282efea7474d956d9a4865 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1680/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5a3dc5f100ad7e695a81942820bbdc0405d7fa5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1681/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e90f52ed1a26b4a544ccf91313092fedd860ca9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1682/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8b4a170989adc33c59aa2e66df22cc816e524e6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1683/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 38371c49b35d212a82152eb1a86905163a81c95f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1684/3081] 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 bcad4728e57b6c2ab38e99c8a2cc69ac1cccef21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1685/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 903218704324de0b49e7e92193fbfaa711b8105f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1686/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 476e9796120844121e480c683636d97f9258b180 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1687/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0cb7f94d69096c2a5e5a5f52bf90118da16d352c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1688/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9dc1a48f053686667e3b7827d276250d5fc7560 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1689/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6f4edbcabf7ff3085c07af3dacea1cc7ae3d2c82 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1690/3081] 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 e624f3f661fdd252a950e8da4052e27e1c638b7c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1691/3081] 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 bb0d5b84b37dd7e001819384968965c8e65fa66a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1692/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6d0560017e78656965b7dbdfccf367c96972e0eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1693/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c45c33b37c8bb9109dff3b09598a31252ace181a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1694/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5b8477cbf884b9e1190a3a579471f58530fa203c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1695/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2e682e51ae5133d563137eb7a57757b1b0c448df Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1696/3081] 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 2a10b453014314b711edd8c8497fce2847fb12b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1697/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 682f193eae18e99656954170fb573f721f3f6d7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1698/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 08bb72519bf906202cbd89947f9a4ed6e27020ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1699/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4f71abb724ebc347e45570738b960659b075e1e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1700/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eee2a4c798f1c0ea5cd10f9d1337cf4d45579588 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1701/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 65a30a28c7d8a853841b47605fd15b573f84fb52 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1702/3081] 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 6d98abe1421405290b50cb4d758a0dbe0a88f656 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1703/3081] 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 fd1d37f2b92dfa87de8ffa47a92b934f9217a9c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1704/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 726d3be88fe4a84264ddb4e5ee1fda6ab3585b8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1705/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0b723166e406621044a50d6402f61d8e4e3cf954 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1706/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c570c265c0e670ad208fd9da541d879a132df67c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1707/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 647e63739acad8619e1ce40a07d8df8eee7e68ad Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1708/3081] 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 47958bfccd0524e78177573752fc32fe0ec6280d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1709/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4c8d3fb66ededff668e8c8c1aefe97abe8d83bd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1710/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 57e9f5efafe72a601c825f58165c7135e022e29f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1711/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 16d423674e384dfdff092917a191cb77bfa05c39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1712/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d993fe31822580c648e9d97bd118deca6f7a2c7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1713/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0c7bbccf83af4cadec0828c9835295ac09118670 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1714/3081] 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 e77c27373af1b593708ddab5541eec2e6355b643 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1715/3081] 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 627f372ec9600193d00f14f75537ba157a9d589e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1716/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c1e3f81e63f8ac7f3ad05c124fb1b12f546554d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1717/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fbfd6a626ad254ced12c2aa155463c0436788d80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1718/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 06c11962e1a676e75b5213d4c50167df2f3ed920 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1719/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 26867a7dc37774c1226f83be9c7188f09d5f9ca8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1720/3081] 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 50a01818adbb6a58a5d9b4f8ef00fa3472fde138 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1721/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0095768eeb77080a1a46aae8f0fe7abf34d164df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1722/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ccb67e58471ac45fa476259d13aaf3b28ae06b1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1723/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ace78c637ad39101192e7ea444fa7bee3d42ea39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1724/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0683407fb0a2b4f0d79d9a29ed538e83794fdc36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1725/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 17486799504bcefbd038001dac271b4da54edf0f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1726/3081] 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 9c9a9af48a19119d57c3fddba63cf942e88cbf1b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1727/3081] 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 5d5cc3452396210cd55924c3487a8a53341216bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1728/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0f97f09c992af44abdd5d148f94784b8ff201f27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1729/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 82362635e5a0960068e4466d0f8ad236f551a43d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1730/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f4d673d1a3a5fc5407577f40533e1e6f6f79b8d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1731/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dae589cda0ef2fc139fe45e513d6e022673888a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1732/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0f5e2b0879a342d738b118b879345bf5f7a36afd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1733/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d89adeab86ce52f63b15f519e883b97c5ca0b1c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1734/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b1411d643a79b79bf2c953dd81d6218d7de5f3b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1735/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4efe4ebd9b3c209d4cf96f1c9b5d7a133d410023 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1736/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 70b51c1cfc84e0110eca82e772419bb8a09d7793 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1737/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 085842f07d8caf8c9402343ea0b21ccbf9908a62 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1738/3081] 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 67f23912ac07327f8e9ae5b96c4ba327f6876b70 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1739/3081] 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 2622be6490b6df38dcf09918e1903a7d6c7f9f78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1740/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1089a7c42800cf339aaffe9163f435a3976abfe1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1741/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d07586a267ced3aadf16a2e34b73368162319c8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1742/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2cdd1341bd99cbfe3918e72947788c76251472cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1743/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3d57e30bb0d85cafc52193addcaafa0b155712f3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1744/3081] 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 4d400846a9a2862bc50bed799e93c9cda4e36009 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1745/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e9e98f91964b84db0769d600548b8309a7a066a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1746/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 192138b2cc930fcf826388818643a3bd24ae2d9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1747/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 431e36e2fa2a11ec0e803ebd0c5fecbfc001bf7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1748/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5755e48c04e04918de2bdcfc2e5c949987ca1811 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1749/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 166de026e7a999eac1f61d3421fbd98396d32ef9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1750/3081] 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 4ac2f07d87fb6cf8a1fe89337b50b5c0de93fdf2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1751/3081] 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 36863bfae14810d0d880a005292e4ec46d0ae624 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1752/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fe6f2cc1b6d80175beadf61ecd4647a2030e15a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1753/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c59043132b66dc5e0665c6ddc10d0fc9f75b8f48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1754/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ffcc145410e5c2b6c84edc86d350161c669a7ef9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1755/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c67e684b9cd4d306ee76adccd5a125ed1e1c850d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1756/3081] 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 8bde19e9f7987aac77d5c33594cc2ea258759bfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1757/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 73eed29af0d97e240ada57e99249456da82f8ff9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1758/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d2d0ea695242ac415a140812f17308f257d92bd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1759/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a216668848d0a71ad1695295220ccccb53b4385c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1760/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ea165684c69db78235805591da9f4f6e9bd2d7bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1761/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8cff6459f6a388a7f0f5f61167a1b3c5f01b793e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1762/3081] 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 4b5f1121943e59b71cf898a85ef5c325baf78a98 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1763/3081] 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 75953b01ba4f0f8e7be32752a3b1afae819bc330 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1764/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ea2cdbb49e118f8387e7a63d93268534257bd4ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1765/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6a840339075663ee12dda7805e5e5b7f0b58c88a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1766/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fc78cab43694bd1f26f782de6bbff4902b4f2895 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1767/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 44b1ffecda77fb077b75948f79e0901cfc6e3bac Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1768/3081] 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 c70af0a3fb82e3b72216d3d9da0c0b1255d7d4a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1769/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 905297791eb3b9c745e50c18386a74e8c4021ff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1770/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 83223c370df6399960c462de471863120cc059e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1771/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 93bb6413467a77e1642f298dbf0e3f30cc9fce39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1772/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba9baa418539e49fc335548c9dd368a66a23b401 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1773/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5957e0d13e43ba2dc11fe305216bb797ead44839 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1774/3081] 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 66add7f7b728a309bc2ecc9363a6e5865abde964 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1775/3081] 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 28222a06cd53a924c3520c1784756630f96a6f19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1776/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 662976e871c7da9bffc63d9bd0e2f51ec945f861 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1777/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 19bcb4e514cb4e0411dd7dc850b17b71b5a7c5ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1778/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 60dbd0472aa17fa3e5ffc3e2659ffebd147f591e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1779/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fc1fd42a0dba70d64ea3b0f69b507f47417bcaf2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1780/3081] 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 33532e3bbebbe1098a1393b3836f1c6f4f666afa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1781/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f539437bcff8bfcef2ae5d7808d244eb1e283fce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1782/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 93dc5737270bad320692527941de47f73405d69b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1783/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7a0984f107ea8e94e95463e7a6931ba3351dc688 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1784/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 259c4889b462c648c2503c5f5847582b2b0d33f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1785/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b48d3f258e866d4d44fd1a19ae945e8c37ad954d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1786/3081] 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 dd8e3c4ba4cf09b74d1428d6b62c9b0377dae788 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1787/3081] 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 9f767cb59fa2c80c25cee1ff72398ab559492fed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1788/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4d6e46e7ce0030634ca70c6a50363d197e7fb30e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1789/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ec6356841fd4a267533ca2205d0dbcc26cac6e7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1790/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 91cc41c6695c61d6501dbd0c4ff3ecc3846cb568 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1791/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 00d47053b2d579830fbe9bf3ff8f476417af1f6d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1792/3081] 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 57bc2251f44722c899c4c506a4e73b3cd8185218 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1793/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cc0faca8f031ef35e340b7f5296fdb077d4fc0cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1794/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 17f9022c68b4cb5db30095f53ca46b00f1b3a6c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1795/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9394fffcd95d3b4e79fdfe66156619b6b4c93a53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1796/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0dbfc3610890f1f232c256fd889d80a7853cd170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1797/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 376418677768f36eea79643fcf22ee27ed6b68a3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1798/3081] 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 93ca41212f9baf2dbba6e1642747830e75b619fb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1799/3081] 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 d249dff1634b95e472d5284ee4a5618e9caaadc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1800/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 28b29923ac8356583bbe8ba0d3a8eaeb65f480be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1801/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba8674672ba9209d5fec366793e6ed7fcd00e020 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1802/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3a2dcc621ecf56110c40888cdfc2a1eb577539e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1803/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8c4a553d9d351b969d61002b57fcbca9b798f981 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1804/3081] 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 705e502ab75a100a06fc500d69d27124a1c05398 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1805/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a267558baf32542dc216b0ac83cb1d33eabf18d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1806/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8faaba4fa6b5dcd71aa62af0cb7b01827387e21f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1807/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 477dc6818a8e46ccaa1e99515cffe6e3ad80c750 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1808/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8cb4903d8ef596f8640cf483e22bf60378262791 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1809/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 94cb9be30cd137d1ca51e1c685bfecb179898f28 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1810/3081] 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 96c3420e83036b39e1647d4ba046f3c762765d26 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1811/3081] 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 a48c41ef246a9e24715aebc0ea7379973e0da26e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1812/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 72941316fbe2e6e637a7c79c3397665d1ddd8e7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1813/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ac7553cc07884b9a2637f6b1fa920485c5fdc23e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1814/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 289b789e2aad729455790fac30afc26d7b1764a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1815/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 34a668c80c2003bfe7f32b0f4c495ca0ec182af3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1816/3081] 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 23ffddf2d0f6130fcde6bf01a9f24d6dd58f015a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1817/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 72bc920f33871c4c4c5a0d82bfc541549143be41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1818/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f1e5a3254a7904c4ed42bf9d66199c00bcdf22d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1819/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3ff95955fabe97733744252ea0d33924e99d6040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1820/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7bed55929512690f4c7e7d2a26c3d7fb6b1bc28d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1821/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 44fc3358284ab28bee973f5758f220b11e2bfd57 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1822/3081] 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 03a4784efb86ab7fda5ad62945cf99ac43f4effa Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1823/3081] 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 e1dfb315c69aa2fc934e7dd3486a0247558550d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1824/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cbf925d532c31aaeb39085a96451ea1af02f84b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1825/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2e9ae2b0c9538cfb87e7fd23f92bb0f47c94bab4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1826/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 67899ec43fbadfb1a18fb4ce0dfa140319752544 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1827/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 87b7fcd36efb1e63fcfbcb8f57a1e11a9ccd3acd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1828/3081] 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 c39589a100740f1edd2eee18f721d9f4648cfcf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1829/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 584d600c47f6970ddd3145b909dd1eb56ce79621 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1830/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 53dfc187393d2635a2cdcb9f3b9b579e6d1853dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1831/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 53eff44735dd596b8c55632d88cd972c39bba493 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1832/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c8a5bff0eb8e5ea23970d9f913f01221aae60526 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1833/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 da29e09d874b6a814c6fcc5b0afaca37e33571be Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1834/3081] 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 1fd367b23f6a75a50b5541c27c654ac6ad88b61f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1835/3081] 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 234f48de06ab8c0acf74f9d7a44f04e5868daa0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1836/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aa341c232b98da8f27185dba3a15c5933dbbab59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1837/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dbdecedf2243705677be81cbe506f493f8233b12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1838/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c49db8ec4d368273e86a57b9d0e27968e03ea2ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1839/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d9a58f18e87f439884834e0f01ae9422571b1569 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1840/3081] 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 0a04cd6c05bfcbc80f34f5051801b575f0b79565 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1841/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b6689f542efc355bd6672770d15cc0ef38c96abd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1842/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a6421e3d769de176efa4a7baa233fa9459602cb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1843/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e52f69eadc759f3b03e547a73a5b0b5a171d6f7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1844/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0c07b004bb4bea17e3f9fad878fa906c1c827d4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1845/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f30be0dc28ce3c92ab1cee75054137a5e59d4bd9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1846/3081] 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 54c35f35929d0c429c438f0e1893eff2dbf27f4f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1847/3081] 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 66a9a35843c4f337d442be007eeede103fcd51bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1848/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1e490856f4da26d209e7bc63fbd594b76c3decb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1849/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a55ee23e8d3d5c2848ac33e39de54f1971a3fe07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1850/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 65cd2c5ff723800d687e71a9b36278736ed97946 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1851/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 64a4d2e3f9a6565068ce93186aa9465098338a4e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1852/3081] 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 3180c2d6fd99cfdbb78151eb62b86ba6287ea6a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1853/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 94aa54d93d63b17e3d04bb940279fb497e7a88b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1854/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d6aa0bc3b38ad1f5b048d87affe38fa144b0f947 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1855/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 31ca184e71f52b4505dccdde623aabeaf3332715 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1856/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 366dd305ba7f779b19b8e3a5425c1860b155ebe6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1857/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8141a6e18e92d2747275aa76b859034a77cd7614 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1858/3081] 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 c0a83157a009b4507d8d35bec31cf36fe170e0e4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1859/3081] 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 d92f9b458e19f03092ace3b6c725378b8ae1d1e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1860/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 24c1b2d134ddb54cbf5b4c32e57d1babc85737d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1861/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 68dbee19b7e365f0b85d10060d33a48039e9c65d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1862/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e7d34f0dff6de58526927c8f5ffaaee13322ba8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1863/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a08db57ff7cd043c4ac9e4d764099027b2dd8ca Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1864/3081] 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 8ea4068b92320b684e3e30be193120c339ff8468 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1865/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7dd0a8ac2c28091fcaa56d0c4399ab4ffe6d1180 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1866/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e189a1de3e7d05162ed0662296f172017ca50287 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1867/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 85af8655439c8804446075291361ccb5ab58120a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1868/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f7c3595cce008fabe6d941ef37ae353fa29a0f59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1869/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e862b92101dd34f5eb1c840e5c4813ebbe9ae222 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1870/3081] 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 ce61b69413909992fa35386815e0229fa95591a8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1871/3081] 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 0a4d85caef70937abae01ece6abab137f66dc096 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1872/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba5e3cd13e0468b2bd8aec49ac7df577729661ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1873/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6e0d3b94287377901fff0605d43866b988355e64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1874/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 804be391d4dc18fc5aad981dab18e548a271fa3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1875/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f7d4e68b4771b189c5e425e9a07d3cd18283c84c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1876/3081] 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 7995a03494ee6c489bb34236163393febbc12aee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1877/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 32189114f0a5fcb214d62be5272f2ce838b3c631 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1878/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de59051e6b4d60be1c308c90f35280b6e2f8acdc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1879/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f4f59fb6d0040deb054c3a560448d7dd38e7abb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1880/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3bf2de5b4c3f697df216659f35c9019cdeea05c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1881/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e37db4d2bec688965408702f541606d928008223 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1882/3081] 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 21219796a6fb4f44206f7014b44f06658cad001d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1883/3081] 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 d5c8fd5e7d48c9b17808d112855bc5762962c674 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1884/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dde8f1fd605ecb44c5ab4bad1f40b616d57c8919 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1885/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2b92eadb761370dc2c44329efd478215420445f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1886/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89f45910ad77716fca66226f33af7fdd6d58638e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1887/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f1d6da69602d99ff40785f437e6c519887e078de Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1888/3081] 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 bbe29868a8ac7a6fc6e4cd95b52794b2a7967844 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1889/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ae5b339bbd9920ccc11e487687067549f9f7a21d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1890/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a56d4d7ec27153e22c92d2b7808f172a06d381e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1891/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 caeb88989bfdfdd594c36a59a2ac580ab83629b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1892/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c79a85643f93a9f88f59057e6179aa126e1757cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1893/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0c9b89bc7c91660f9a669ae6b6d0d6ea14c77498 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1894/3081] 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 ce7dfc57630e8e1ec43ea220d7dd841d9bac3d11 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1895/3081] 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 195f3a26660df74e0f0abd8c3590e7f40d6c0431 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1896/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2a3015d6ae48d2c77dc1adc4460af27c84923b3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1897/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 28d4440a8642c50b708eba556b56bd18e4cf1510 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1898/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f026da790bdbb300b4cef773c68233bf1a222cbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1899/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 237bd6c512fabf6f0d03ca9845bb565f2ca7b739 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1900/3081] 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 c5497b041420223855cf3a55a04903d52e478e29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1901/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d2675293aead6042c46a298a114620e8ae5feea1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1902/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff0d24770e5c1fc15a8f46b924bd7704e6e8f20f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1903/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6f0def1f44c90b31b8baff62e983ee523087a3ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1904/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2307740a7165cdded8340e83e974bd664f64539e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1905/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5c5716f83287962fb16e1c824ed6ea97e4373b53 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1906/3081] 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 22fd54533153a65dfe9173dfd813b976ae7d29d1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1907/3081] 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 7d9daa2adaafd164cb51bb69cdd457f4192bfd65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1908/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d6298c660356cb4e5809ddb04d0e1edc7f260edf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1909/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8b9d77aa9e1d106f085f3a70c7c5144e8de555e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1910/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6699699c4a6af7256e4cd12d5017d7c098683b28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1911/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e44a1b22da14241aba07a063955da27edb10dcd4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1912/3081] 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 08126b9da2fac44457635db1c3a0371f77219e43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1913/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8ea68ff178000867bdecc63289f36e050fcc29ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1914/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b49096b371f839daaa2168661fac509321b6d997 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1915/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 01057d30e17a944189f32e67cde4f745b4471486 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1916/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ddd0d44dd65dfcb12dae1e57c090831d4cbd43e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1917/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 959caef9e29fc48b7de18f56e834828bdbd8e43c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1918/3081] 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 dbc4ae70b7e2316508f52ff6aa98115f3e0ae9ef Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1919/3081] 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 8d16a39c26dc8f100ed4a1acce694981471d05d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1920/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dcc062b112261b863a643e97780f134c8b362b7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1921/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 085b7a94d856b90376d49d45d93f21a22c2ded91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1922/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 968b3b6a3cb3072334ba00f0c1a192212f00ea7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1923/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e90dbf536402aeae6a1ac9aab471c1878f1e7502 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1924/3081] 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 8a764ec4a35900cf0e01020e071d0bb37311b04f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1925/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d637ddd4ed48f09959e981755ff4afbf88315239 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1926/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aaa704ffb7de3b845a287178e1e2384eec2611d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1927/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8e0eff69392040eb979394ffb83dc776a2042398 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1928/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d5a2e13255f0520f5abc29db53cea1bd9db61874 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1929/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 93ae187a8d8d30d4468274ed9419aab057598037 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1930/3081] 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 add9fe5f49e2e6429890e2d80a99b49529d39640 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1931/3081] 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 b214e181f7a691cbf4c8f2d6f775323b729ff296 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1932/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 73b73189b298e34d45e4acc50598c334edcd1cfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1933/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 70ed6d2ab827eef55d689cd8541946a2e9f55e03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1934/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ea8233b3630284c977709f1866b6392033fbe805 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1935/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c51815ae11ab9080cd70ef1be554e1e126274c6f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1936/3081] 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 b07bb8ebef32d1af1bcd689cd2560a06a003f537 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1937/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6bc98482e650c99899b0512fa7da98bb7aaa8fa0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1938/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ed2263e93fb9670ae479a0e483926658578cbadf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1939/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 025501b4cf37c30228a5ec2046e4dee504eeb35d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1940/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 26261097478db234039bf44bffadc0d99b287a6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1941/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 402dcb02e295d63c0e0acb3000dc81d57ae1ce48 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1942/3081] 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 dfa0a8cc06c9e1e2a9bd587e3571cf01e5cac0d6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1943/3081] 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 b7a61b7367adf1423b0e42ccb02e56a59f626b05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1944/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ac7a94d8167ad75ec128da3d44a7e91f9f8834bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1945/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f2733fcc287c3ea6957431961b2a9d46d94c8c07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1946/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e37f8970f01078780c8305b85e9774f90b3a4ef9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1947/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5eb41abe8e7838531e5a785c355beefa39332540 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1948/3081] 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 176c921d30f5d5154d79a9c059a7b10926255283 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1949/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b9546ddfff10a67d62892f6d63cdc7beb7bb4a07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1950/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 63f874da2fe034b17d29c6c9e15ab3b6ea1b035c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1951/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 26e9f421a72f20a0afad0a3cc9fcbd86f92187d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1952/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 62ed5c3249875aee56d7447784d9036a9cf2a98d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1953/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 da2acef95ede6991164d876c7f2f6a6e2a3ffdb5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1954/3081] 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 c7dc4b72873ef44a5d083947e905fa4257388739 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1955/3081] 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 511376c8aa5ec52822c25ff1a7c2585908ef5148 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1956/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 024e50a93075635cdc3deab8913cdd55e170d69f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1957/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 79ffdbdeef9610f14a3b290712044eb4f9db0028 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1958/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1ddd6a05b0dd22be996547f13287d30d18a8fe93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1959/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3e86d4d8458d4ea44e9c77bb42fa926e539df57a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1960/3081] 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 14f48facfd33cab250a8879024808304d2bfea99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1961/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 afbe736e80b57aa64a6c30e2a4e8bfa6648ea678 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1962/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bd10944d09d17b8300767fde6af15ff3be9cbdbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1963/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5dd8d105c0e4f0eaa39d4a07f233812529b50bc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1964/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0e6401c657bc8619c3cfee218e991f08e7e67145 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1965/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fd4c5d16fa15cc3363ee0f87876c8e9017b724d6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1966/3081] 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 c4751e51a2bf1ef886a49801c32c9290e019d292 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1967/3081] 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 7be5cc35db9d0018240ecf7b92203f03a9787339 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1968/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1423e715ecef486ebf0e5ec8ad5477b1bc8601c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1969/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9cd16977757d4f33cd550ac6fe27f418e72c58af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1970/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 78b7e15fb1b28335122dafc8191099020e2b5a99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1971/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3a996589b71a8bfa31f141a495c2fff1e7321a9e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1972/3081] 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 014ab8fee955503f92cae88d49ff075b06b0fdad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1973/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 229c863c4c74146fe5b4fe6f4927e29a3c10fd8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1974/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 41b43ce485ce994a54257d814a85e56c6a553638 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1975/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eed0a5fba5eae826b0b4c040369c357113d97d2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1976/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4b7ebd714bf39b98ce7713a29b9b97dc475dd28f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1977/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6b84b77417bc41e465b6393c0d51b9b1e68b4f84 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1978/3081] 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 460fa07c3aa0e8fc265e1ad02b7692e029c41d3c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1979/3081] 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 530b89ad6455e93e047eb04a48c2f6933786eae7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1980/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5836d806592324c8e3efeab495b32542b8379c7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1981/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4bef3275a761f3c14fe8f3e92e1378b38e0e1f1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1982/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3454ba0d16db658bacfdd797102e42ce4efbdb44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1983/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a38149d2685ce6f040c11842e74468c5347dd20 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1984/3081] 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 266f97135b264cbdbfb923ff74a1d9f66261a764 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1985/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 545b95f8ce451ae05f7bfa5ec0c2bea9cdb1120a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1986/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 af7485bbe88f1d4a6f911a6869e3bccb5204a0f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1987/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3ea5a8cecdfb95a640e9d87581709d28ba93543b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1988/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 446984bc267d7e3a542003eb9d561d0f204bda36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1989/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 31393a977be7efb6c8a94402fade3307640ffba1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 1990/3081] 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 6a77419b958b093fcd9fbb046bc6f3820223dbf0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 1991/3081] 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 2c35cfb0d926b32be114059a0e185d44decc7af8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1992/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a2a698c8e1831be38244ef3fa39927b945ae4447 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1993/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8ccfa5a475abb77e3cc18e7d61a2a87cb38c32c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1994/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ccc34a80eaa4af9e669f040e526c924c878535d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1995/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b371f32eef902bf2da62380ee3e7c10d3ad5af4a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 1996/3081] 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 3347bc4acaa22d58193b21cefdc18db14e59f710 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1997/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 925989c3d1c5817edec4fd172e9f62f475737550 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1998/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 54cade4a1cc6e00bd3edc66a633535ff90646a06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 1999/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1b2d3a5166079f2acb7db531c231e4daf2a2a343 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2000/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d803855f03c6b28d8e04aee23a89e278b4586f67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2001/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6162b8808a7a25112c145a2322e5d865f0c7cbf3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2002/3081] 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 04cd348894885c60436fb0c5c83c144c64c46aab Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2003/3081] 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 8b7bf1b68e7dbba90d9c3ddabb2191acede5e123 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2004/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b979707ad90c931db3c784d7b313f10b260285fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2005/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8e7aedd02883282b7b36d3f856d2a934ed22539f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2006/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0ff9dd83e1e39f2187472eb0a4905da923b425b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2007/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 316ab13b565201e2f2e80e25aa05eef6ad78a806 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2008/3081] 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 4e69851a4698efcb86d1fc7d918ecc5f5f8b745a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2009/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 75a73c1ec87bfb26e1cfeef27b1b000a37d4cf26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2010/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e81ff2cf80351d358e68aeb7cda104e26f2e0342 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2011/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6dae79766d34a9bdf15e836e21da80be2a1a5e6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2012/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 670bad2728bc576615f56d162ff67b48df1e760c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2013/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2b04749aea73088605c4f5ad3310e3f569e80916 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2014/3081] 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 619635e086919e9891d4668ce161c8968a9ac2c6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2015/3081] 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 fe754129fc5ec70255f65f026ae290635cb35859 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2016/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de6707a1887ddefc987ecb11ea3e1c564f7371f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2017/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bc4f947906351d620b333d16e1e47e7681d9cdaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2018/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d54e05a39b5d26de42f2d637d207615bf3f7e9a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2019/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dce1214c29a53ec19c073428a699a0e8c274db87 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2020/3081] 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 3f94137c8c26b8838be1438c23f133f0aab6215f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2021/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c834f4d0d3e5bf3112392f21c278f0c84e188241 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2022/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 df0d0a46d04e83d02bcb1f7d7efbd0eb7257a900 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2023/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4a8008740531cc5c22520e6d969cc7efd8f0070e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2024/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 74b001bd6299e0ae2a703915f227563c90ff2fac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2025/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c28faacfb6b1725dd3f96d79abf563127bcd9bea Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2026/3081] 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 f71956d1f75bae0c40f164b5a3649756168d93de Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2027/3081] 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 930d29a15325e979760c3f680a760d0bb9795aa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2028/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9e20baff2d7ab6a937b2821d27fe80b22df31db0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2029/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 477d3be267512afd08114dc271aed852ed26f45a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2030/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 220589cec7c670ac58f45b0be8ccfd60693a6aec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2031/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1dc29c5f56868a9c4a5134548795db435f52973d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2032/3081] 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 696bdb4dea98535b5523323cf4bfc787094622c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2033/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fc5de9522e0d986444a508a17a2f134d4a54de9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2034/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b7e112fc02b68cfa111797eb39c994b85e1751e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2035/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0b840b0e961c7d02426a4fc69298818e8ebe74d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2036/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9908cc8da4d572fcb32a65a8bc02de4b9e47291 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2037/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e773bae8857a2af8b579ef6071eb10f57acb14b8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2038/3081] 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 c8b5e37fa3441add58eddfe8da32addec4ff8374 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2039/3081] 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 3453900a0c8b1c8de6c21c9e52cc9c5ef357e42a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2040/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 159416c5683a4460026d716812c6efe49bf05c28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2041/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 17fd5ff93f3e0b7986f58a965b1ea04220e9007e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2042/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dd0f0fb7c922e7a0eff5d6181e23f58ea40c58d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2043/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9c41d4b9ae2f26ab87911324c5905bb493d68ef4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2044/3081] 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 215fda9d96951dce96b9711a2c9837d4f6c752d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2045/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 817cef3cdfc153a87d0f4d5f2e877da5b526ee3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2046/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f1e43528d0bf63b5fcd1dd877d261c882435776 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2047/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3c8f36f015d5399dcb8870693f34991b565065eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2048/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ffa6fd59561a2d5815f306b1208a125f354aa849 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2049/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4c413a39994e097118b7ef723c21c5e9d9c25ee8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2050/3081] 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 30be3f6fcc8d8fd032449a01a9e7fac8b5304d3f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2051/3081] 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 af90ff9af1d5b00ef88a3aa0a4ea270d0201bb69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2052/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 15e516c784c6807939a5d0d6f40e52b1e01f3edf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2053/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 16d004bf5c1bcf107929dea6b2293c6932222cca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2054/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 06c7da399087f01e043648cbb5a24b14a63c7450 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2055/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e458426aa560d9084d0cbb5c5652bbd3d7e5fbf2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2056/3081] 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 be63aadacbe12e748e81d28642457ab3372e3b61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2057/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d5a2e7b1347b86034accd530fd7951d83c587306 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2058/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 86b07f00cbb2e399322b9f7aea24b5b5f09538dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2059/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6154849496b8f79c56ab7af91602d87a34c9067f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2060/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c95e41ea9f216426d3205eead7aff03c9bbacffa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2061/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 400c93f94c44f8c4675318d11626c4206ebbba2e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2062/3081] 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 076557a6891b49231a542c6c9e2f4b2f6f27c079 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2063/3081] 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 042187eca126f84a46677401d42ac15bbc0868f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2064/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d77b849c7e66e5666027807489f0996ec13ac24e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2065/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5c150cec36676ea012a5401ba41ed5008035c852 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2066/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 84d66f731b4d5e84c064502b42d9c964ebbf0a98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2067/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b0d9381f8ffb5c7a3e157fc88079ead823a593fa Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2068/3081] 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 d42de9af198a7a1a50d865e5d9add7c211c29c85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2069/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1a5cdec42169178ebfcc62634ccce7d7a1ab33d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2070/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9be2e1e47a3e0c6d0bdec743164dcb8746d39cde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2071/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5979a95f015fad5ee03a517bec074a551e08cb58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2072/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f66dfa00dd8502a22b106d44a221d6176b790ea9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2073/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 02e06d32b6abdaaddeaeab62543496459e12bf22 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2074/3081] 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 a5b32e08528e46eac18e4106f8c96aebded71550 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2075/3081] 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 9f38dd10196978fdd2e4a31bf65d6a9cf99247ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2076/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 978a3c2f9ede6c1770f3fe8bfb2fede40a40da22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2077/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4fae573af8b65c660b1cac17e8a69c20531978e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2078/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 722eadfd2d2ff5f1e9607c9b0e127edb0e41b315 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2079/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 221b10889fe98418a622252d962c819be2964248 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2080/3081] 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 ac4f7bfe988b514aa49d80432efcdaf7b630cdec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2081/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 83bebc0f60833f97403bb69b188c821c5f3064ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2082/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0d66f44ad64e218b04a324dbdf7e1cbd957b1908 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2083/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e809e0d1c47631165ec39e3d9b177a3a4b85286b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2084/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 171d9a57ea041a88a836d285695eab5273a8a928 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2085/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f6896734964236afdd8455885b92b54964c0bc04 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2086/3081] 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 8db7a5b699d553519d8d78be184800fab6f3b232 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2087/3081] 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 2fea16a93e44567de424d908dad477516e788814 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2088/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 151cd338fec5ffbe2c130492ecea527b02cf2637 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2089/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5cc1c026b2e4aa2f32959c9624a9797f59319b75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2090/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 db6455365efbe5a2817b21c9ae468e12d9163ff7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2091/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 21ca527e40a5c774f8245f1ace6b63f7398ef8b7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2092/3081] 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 f86c59084b12f7c0da5f712bcc876ae89153d377 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2093/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ca1f8ef0c46ebbda9cc1074fdef452797779150e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2094/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3f5af1d8918e1b7453359547425cd73efd988f84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2095/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 099e0e1af7d3616420315faf1228d031e6d7a7f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2096/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d3ac56f85f114b58b4c230c7aca1f47eb37b4124 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2097/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4a47ed3530646a68825b5e4fa058250d247bf40c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2098/3081] 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 209850aea6409355398e24bc15da78bc7f1dde5d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2099/3081] 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 c16e5a5b8d252f188b52741d50171b4e1b0594e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2100/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 503cb42289a41b63ecc5e879116ca1bf403faa98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2101/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 896150e0a20f97808d999ea596da7b3db1b051e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2102/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c62af53f9aaf37db6c705da9449d785e09af8ca8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2103/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d7fd3b2541d5ff84733e5e3ae73e8599b08ead23 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2104/3081] 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 de135581f7d217d8e5537d5a7fcbd2e728e881d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2105/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f776faf0064691f49f623490a6815a5cad790a91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2106/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 79d1621aa7e8587ab4354bd40d8a89c76d050620 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2107/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9e96d36c16eae38e6083b8d4d5fea30ed846da0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2108/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0323977358c7749083d2b23d8b405568b04f5a03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2109/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 be5fea633a065534ba49f7653297b0b98294d585 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2110/3081] 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 2c1b338841204e6724a6cee374ce08f5920901a2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2111/3081] 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 a1109e8ae5058ce1f05782807d37831c54312d92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2112/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5e18c548a05db97e6db97b2dc4805031f5d6ff5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2113/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 530aac83724244c372bb38df964f6a111585cfaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2114/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3c8b73b1abadad07d43f420545eae5a94cf735ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2115/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fbbe6feb19f06f4f92c1647e35194993e640ede5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2116/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de8df328b63a272111c3d865b12a174b1c453cdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2117/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c58a98c2a94e5cb22c413a10a3ed19227a73398f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2118/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 65b790865f61d7dd56d6d1736298ea27469ad664 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2119/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e92f690af2c7df1f562f7ece34c18f0946a6b003 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2120/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 976a81b1aa8463aa0bce5d081220b0e76aa68614 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2121/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8966881205ef418bcb7c9490419d08f945c8f3ea Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2122/3081] 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 2f2fdecd340b914c78816834d531f856095feee2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2123/3081] 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 ce0d9c9756d080b7d020c9e84ab56c896a21e9af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2124/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5702b79aadffb6a1233085c35b2b8615bbb6aedc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2125/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b3e21e117b15ae06f3a6acaebf861ba7161bb0a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2126/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5787e72d58d147bc5ae5beeafed3675754f9cff5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2127/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9da1758f4c45897e0a035d77cae91873752dba7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2128/3081] 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 9cb19aebec5d63aeb6c23a122253673fb5f2d0c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2129/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ecdf8e4f7278586ff8421ed37a38f84a80a1cbe8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2130/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9b07f57b04936deebe99fbe9257ee55a1044c74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2131/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 02ab08488759823686f0eee638c593fc7a324007 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2132/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3849ffd673f32a34351cabb1b3a59cb11088b8d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2133/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 07cf33dd9808904c374b050e49e3cc4a54cc9938 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2134/3081] 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 c864ca051ae3f86776faf7fcf1b88fb919110afa Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2135/3081] 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 e1d40acd547bab4ec91976153b02a74dd8139aba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2136/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 803e089e28fb111174d3423fd0edd4d46be9f80b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2137/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 384aa429dbe2d6e7f69358d2e25a12e050804749 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2138/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4fe14a221aa97dd5b29963f6b1d39439450a663a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2139/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aa0eeb36d0d03dfeff92ab1ee6e1e1e5cd5eca96 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2140/3081] 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 a040080368279d762b185075b80ff2233247b04f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2141/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 510a9ecb011a7be0aa7dfd3b3e4f295e9d9f3841 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2142/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7bca0ca2579ac29ec349abebd384941be39e55e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2143/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 35445c825e4df2030426fed4bd323285c5542f3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2144/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 996b82eea79b887353533de8670fa170e0c98f85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2145/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ca692da0870b63d57e13cdb06bf70f7e68c1b55e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2146/3081] 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 8c835813816b24917e1f3af29f75078c74bd007c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2147/3081] 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 f4fa8a8229e498ac1fcca8ab02deccadf672ed1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2148/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aefb233589a54b699788106f1100728527fca7f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2149/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a4bbdbe9d57503aa249c888db2efac12718840aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2150/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 67385f6f38e6ee6e5f1ff7a4b184b5e0b85dd877 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2151/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1f648734575ab38195f8c7d6523b214537233084 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2152/3081] 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 706ad6de48b275198e7e71a652a7f14b4c201c30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2153/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 264ada571cb7e230150a5ec87473310c375d4436 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2154/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 52c92d67f6b79ca6178cf35a980426472eed7c46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2155/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a6e9f042c9ad55e7a01897201dba03f1154a36d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2156/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2527bf3f7c470556b9a56cf96bfa5d5f8101c0a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2157/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cbbad3cd20659156a490bec2ca45465690ed3a8c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2158/3081] 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 ed13930187271fc2d51918acb6fd499f10fb4299 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2159/3081] 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 b2353b69fb92419685fe5514ea8e907f8e8034e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2160/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e8ef7c1a85938d04cb7d86ab28c4c14fefa3ec38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2161/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eed80a03469810278a8d48f8dec2bcda876637f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2162/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2cc9814eb5a25c9de5e335f49941bb83f8a1050e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2163/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f479c34e711356ec7a652d7ce3b30fdaa9dfcb7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2164/3081] 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 9ae5400a76f7521ef4f0c49dcd940eead8dc1120 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2165/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cbe229ceda2dbd6ae0d6891609cb4d34bc2be5ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2166/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f34977c5a43aafe8bc182f01d014b6bce04dc6fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2167/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b8f760ef39fe75d2b334898d39eb0965f5171a22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2168/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 71312d250144647c8e3f881f4d805578dda1bc8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2169/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d4e07308ff5e7db59ffb3f46bf758c4a8ff0dbd4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2170/3081] 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 d180ae1000ef197a4aa0ec8fe50d97f323baa656 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2171/3081] 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 a70fac6c5764fd26ba714b27436622e9e81a72ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2172/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5dbb604311053e15deec1b4322a3e89f5ce68f5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2173/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dc193cfc0e6f29f3d03e28533f0f5b7bfbacefa9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2174/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 25b42c13214dcfaaec5e075130fc02a14db509ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2175/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f232338b4dd38220e2c87e320a4a1024ee4a4be4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2176/3081] 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 302162a81bab74c0da50a8f39f623edec9d0ddad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2177/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8116604c705f0452dd8ae10bede2ff9ba299a37b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2178/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a835d7ac40d5eab0fc1732fcee15bcf8e797c3cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2179/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5b643c9d101d690f0ecf12c53cab998454b5dff9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2180/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f7f5a977f58c0f91cc8ab93828b91b884cb729c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2181/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 60760272e58cb19eefbd3ac59cfba26837e06d4d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2182/3081] 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 0abcc64ff59b71fb8c1254375ef13b103574f2f5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2183/3081] 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 501f0852df6c4b79b575d4d18ec734a335b6a81b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2184/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b9ef5bbd829fe45db9efb4d25cfda80e7090d802 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2185/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0750c650103955debef6e105caac4e30b79e93a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2186/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 35de965c0d2e7fa7fbb2ddda5645e29f979358f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2187/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a30123bcf5b91bae2753f768c17394d5cbc3ab8d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2188/3081] 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 a43dae748e9251d36ff52c410741d7e475eaf3b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2189/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b6ce2c5fd29b8800168bd0188ac71a94ae9045d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2190/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8c747cf90f284d67e17559e33b5d71712cb85f24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2191/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4009265e2d8925dab7861a7d4819f1496eb82627 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2192/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f296ae4fac582e7e0334933d09b2b500ec8faa0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2193/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f4a2120503359ef8755ea61e44d4c31edef0ca05 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2194/3081] 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 d95b4a711f1c41994864ee380ba8839a06ae6f77 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2195/3081] 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 a3faf3c360f0e13a4c57f7e0cf0e4d53215e5895 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2196/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0ebd3e6b8078466f8a5879f64ba1fc21f4533533 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2197/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8cb616d0ca5056f3491b5778e13d00efff0b1da5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2198/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 095410de5567f14c35ba31fb165b715cd76ac143 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2199/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 777a127dc9b500e46cfe7af6f0349fb435cf1238 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2200/3081] 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 0587969a9bb0cc67be9f9cc2b54a88db5db6f5fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2201/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eca590528e1dcaff87c7c4445dff826950ee4b1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2202/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12add84bac6d274fe94c76acda5298e657d5bf3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2203/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f39de1d6693710260f8393ad2e0fd95cf025e11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2204/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6a0d273d20e673061ae2057946c581659a1d0bbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2205/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 74bbe035cad786b7b3440efedf3646e967f5e30a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2206/3081] 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 0901a6ec656b39323ae3cfd363e6a178966d7a5f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2207/3081] 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 d291c27a7b1715c82d767f40f4fd4dafd76cc95d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2208/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e8df68e8cef13abcfe3b376b462b5d4b8be1e55e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2209/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 afb5db3754f30e654f44b236f6a38fa3962d4616 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2210/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 17a3dbd44fa30820507c91780cefdac7da493b7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2211/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3945f12a72fc71510bf4c53dd4f62f4fd6c0affc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2212/3081] 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 5bd2be7a3723426f9835c14fa7450dc2417ae082 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2213/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 311889aeaa6af1035a49f153073c33d061f6de93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2214/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 275c9a41e448e4f726a45f069f78c35d70d6f3d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2215/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 811ca00d62a31c08cbd14a789be01f4e532e9470 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2216/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d48eab1006e0ee401e58130e11d50ab6aa38b435 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2217/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4e1104732061c05e2da96c67e071a32ebcde07cd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2218/3081] 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 d9bb90b8d0a837f1025ac53e79e59677ac650c71 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2219/3081] 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 df12a487bf9f90ba5825ea8e6990c7983a20815c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2220/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5ba7d7f99b2676ec9fc2404c5236612682853eb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2221/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4d3a90b417d7edaffbfcb9a66b86453d5e1094c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2222/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 232308599caa34813b2338c386d544bc443ae98b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2223/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dfbddcbe2b2a012046fe7af472261678f6fabf90 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2224/3081] 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 447bf4675440e2d046c4c2bd2f083738dbc900e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2225/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 65639fd3c5f7be6b4a6d515d8b35af7b6fc4c1f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2226/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 452b488e384273da3835c6658a354302e85221cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2227/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 56737a36a4cc5e0ce81028c9ba4b1de2c2cb0dba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2228/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f8d9595e59a4f21599df12574246d0d749e73489 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2229/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f766505aecfb63a6132399edc90d161f2eaff3d7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2230/3081] 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 dc59722bf227e373a1ecd3d3dbc40be8f1707e53 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2231/3081] 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 3f498523bd9da56b651631c8b117621c32b66a15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2232/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4941b9e4b770c50a692447772f6233ae16a3f87a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2233/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9daa3852794d211c47e0e8badd1fc903901544dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2234/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8a86914d4dbf3da8bd43c81311702c5e3ffa7332 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2235/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3b1fffed6308eee7b183478cef9fda38060ffcd6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2236/3081] 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 2a4cda3307bc04c37a3f00ff84622d027cb89485 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2237/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 90518c73e4a7846fa3460b5c544cd8b49bc29a87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2238/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e0df3d8cbac5c360f097e4f03b7e59bacdfb7837 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2239/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b6b70c49f3377fbd74f33c621d31caa4c6dfac84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2240/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d4a097dd28e4487573a63895c6540aba07d8a7fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2241/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 36495722e3e99d78a6507bdc2c656ee2ca3da1d6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2242/3081] 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 d92da35b401758fece60c12c060dd6166fa665b7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2243/3081] 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 f326dff30d9184dd0b3ca2c90ce09792cc8e6a4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2244/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 75510a7a4fc1f4de5eb0d3ca7c46d30869c05211 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2245/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7297c6ecbdf27461b827006af1d0f7e5c1c2dc28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2246/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a7b51deebf3552cc948d97a23e88a99ba808fb76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2247/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9cd5b1dcfc21203019510b8397ac3dc7d5a450d2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2248/3081] 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 982c0840ed6ac12fea868fa9f4da5b2331fc388a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2249/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f7e3f38759bcb124603b87f7ef7b939899459ec8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2250/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 657ad64d1f8c7afc8db34e776931e238400e9526 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2251/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 620a78023ef815a11059b4dbef450e6aa2a74a91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2252/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f950dbe5445e92f35cd109c52a5f3eff8599ae1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2253/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 365bbbeff187bf25a3c35a61f0592e917e6415d0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2254/3081] 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 9fa3acdd1c92cd6442fb773c6cf64873439218a3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2255/3081] 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 6a5217f40f1ae221b19082fae842e450fb5cc188 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2256/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b5d2f70d16dfec30d3eaf1a3ab087d1599708997 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2257/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 287cc4de93ae07fcc19ce1c3cef0ba28213e51f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2258/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 633e8a2b82e85dba45cbeffc4f1588ac2104a862 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2259/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3d080ddddfd40cff4078cf8f6a72b0b4f249e4a1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2260/3081] 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 ce9028e8b45da02a269f41e46df9f3d3cc263f8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2261/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 902ea77cebdbedd95fe2d0d0f3888ee7ad72a656 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2262/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9cc6467eac3138d8ba700ff9f7f299c8e8509cbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2263/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 00c59a7a67dd78fca8c568ae61b4ed2ffdc99759 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2264/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 747ed48eb22c43e7fe70c3a9b768966acbc5342c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2265/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5059e2dc6eaad6526cc2a3230858c5726de54d81 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2266/3081] 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 41b524bf5b5c840ecea9171631407460a26caeee Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2267/3081] 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 53cc1ee84a64690e974fe774edd17a1dad857de9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2268/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0045ca635e700ab86f30413adaa35fa66fd151bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2269/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f82dcecbdd30302e21edfa15a63303034788377 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2270/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 82a8372c5d24d3450930f4a9fd500a1eb1b236b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2271/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e3e0488bd97b256b93050bc39e7d5857e1c663fc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2272/3081] 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 cdc1d576a61b929fe39a9577f094c3b46b3195d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2273/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7a00a5067ca400f95b9719e3e017b870a44791b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2274/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 11c4f98a1935f80599a732f5d5f5f2ed1b47ee8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2275/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d08e6916692722300c245eb4e1d498be9bc69625 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2276/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eb6097348338e1de49f585f03559646f7a2e9494 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2277/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 11ed8125432c51ac0ae13298b4fc53609f901b0d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2278/3081] 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 e98a0d017791919b462ed144182c09799559ddc8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2279/3081] 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 d82a088e8c050257fdeb27a8d35e6d9a4b6b6143 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2280/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 81031a686a957c6197fbf9bce328bc9f844acd13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2281/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8642910e204420ab26fbe6094db0f9ad2e9e5280 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2282/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cef01b630401926301226b674d082d46f18db741 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2283/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7c466ebee3c12071bae8a91d54c724df94bb496c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2284/3081] 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 1323879a73edaff68784c7f7438790ba6fc80d5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2285/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3b18f6b31a19d16fdfb173f5e4a6bb24653eabf1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2286/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5390c4c106c4bd66cdaf810484111160b038cc4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2287/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 33b8fc7b0b2c9d3fde6a0a486db173ecdd5c3767 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2288/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 79f0e145ac8215d36ca0c36bc93a189d5e9ec336 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2289/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4007728519ef66eb6b7b008b3ebb7a545e46e5c6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2290/3081] 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 de3f2a692c003b96c4397f7f6cd4722d9a17110e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2291/3081] 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 01f5724ba6bc9534220de6657b27f95032827b99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2292/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d285e87093f4f6f4b7a017742f9938636ce08977 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2293/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d219d01cc3ba647b4d5c9c3c23591878e7c71939 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2294/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f72cedc4f268831f4050aedfbf0bfc787e2f41d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2295/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5418242fb18ffe22806a03936deb64b9bfa68ffe Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2296/3081] 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 6369077045ac1b97e4cc2fd63d682095efad3860 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2297/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b7b644f4e8d53378a84bd9f6149505483d172604 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2298/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cc8cc15416510c4394bbbf8567dccd6d9d4fffa8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2299/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 db0b88a59f25293cd3ee067a26c61ee10c406b39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2300/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 23d498343b9ceb49af1eb59c727329cc4a19d685 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2301/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 60a5c96192915eeb9cbfef822419c736982d71f6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2302/3081] 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 de10bd4390a520ff6e781c94fdb84b25230ef1ed Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2303/3081] 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 2b27e6a4f24c268e3a207755fb8e911dbc0ba21c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2304/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 138ab9b31a8e03f306a82a7703e325840744cf28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2305/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b560475803da3df501ad17cdbba09848100d8eab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2306/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3b7967b43f2fc943006fbdd99f9d40994f48bba4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2307/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dbd904444546dad7f7a8d947e2e9f2f98f72b18b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2308/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 871ebe234f87975c67945464429f1820e101faca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2309/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 679da7cf5827169b47419573ee1041c79386b33e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2310/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89891c30eaa1a12c6f589ab58a90daf112bb9146 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2311/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2102eb2de6c224eca7d6b0bfaba3ceb166724c64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2312/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a3c7af6bd4be87b4e31d1d03f9c1a558dda2d498 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2313/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3f7adeb827ebfdeabd858c0ddc30f9aa5ebdbe1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2314/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e7187a6806ddd1fd6cc5de6b6df48d5a0eff8817 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2315/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5056a40665f29864a78e6292289f3cc09b68045f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2316/3081] 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 62f6d33a31769ce8e6f173fc974777f78b96f649 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2317/3081] 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 f7a7c826c416b2e210250448a6c6ec22d6f8ad4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2318/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8d6cb8bd7e98680f4975c926b17eb59a0ed9c50b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2319/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba96f8a9f45545f3488deb9f86637981843d601a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2320/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 068c3409e8b571ebf86ce08167eeb142a3af7bf4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2321/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 286da9822eba9394747c631640a4f23668887c8f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2322/3081] 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 a8b582100d2681c02d4b43d92060362f872de281 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2323/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bb1a40af6722ef42e61219228c653082bea6391c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2324/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 88c264c1452685d972360f53d2ea0bd5e6d2ff48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2325/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9465a32f5c7769aa7856989ad041b3ba84b01789 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2326/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 28564f5cffb8edd725f46c2b185a021b5c0741e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2327/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e888ad718ba085d4c089f48b84f364b8af3bb587 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2328/3081] 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 19f5ecdec655ebdca3f2f891a6c46ce00e544eee Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2329/3081] 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 57373b1b6141e389b625a2fa8df9f437c53fea73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2330/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e44f245d6bfbb541f112c379458ef5b69ce5a017 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2331/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 191fbabb923cd62c041d0e772be728cd795ceec4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2332/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ba0e0e7f160e95710faecb96812c5ff762f40cad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2333/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8cf95f07b78bbcdb83d51d4dff41b96dc43c1337 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2334/3081] 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 942e245f81121808aabd9ef324215d11d0a72f4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2335/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0239c400cebc32e40bb4b45c49a4078d06dfef63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2336/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5d411af3ea712d86f3a97174ddc86a5583cce057 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2337/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c513003a54a67028ae7248e4f1a46d1e53834d15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2338/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 92d50c06541d98d2f9190d34effd086eb4ef8893 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2339/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 96aeb496b31a73c795cce1cb2029363744fb938f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2340/3081] 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 09f82a573641527ae182fa806cfa8a5043b3720b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2341/3081] 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 52d90cd5037e392c2512b7463337cc1c52ff4192 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2342/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3deb49cfd3cc9e602aad2f0e553be78d06a2e96c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2343/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ee7872dd75787c79a2fcdae0554668addfd51d1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2344/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f991c6c794982be6d7f427d2cde7e4d8025bca7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2345/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c0f0e35e4b809d9acb955c32b51c00647e463ffb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2346/3081] 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 b47ea0963f31637301d2b69c612fbc74f14c6103 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2347/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e3160eacd568b8ec8784cc49043a161c06fcdc73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2348/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1e9e7c12242a1a4edb5a2304bdfd300446de9ac4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2349/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 282308ff7314cb0177aa89ccb95ed3d3dfd1c8d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2350/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cf985143ebc171f3fd56def307dd4ff0e13ee4f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2351/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12efb4c4cdb15a8f3c5d87e23740551177af4e89 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2352/3081] 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 dee3cd6739113b6feaf672e6e554a7d2899856ec Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2353/3081] 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 3d2323968015c1a725ceb3535a73f407128f9070 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2354/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 877a7188f122da9ac95dbadd4faa3c92899f5d88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2355/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 81ece0b1bdd68cba871365ec61d8dce0f2443d4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2356/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8861ebd9e0e9cb317e897e384f72d7447803cdca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2357/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4ec2aaf6ca8698415f71c1fd2e88704cea2f2c12 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2358/3081] 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 47e2b07e61bac515c18e57143067062b2c9161d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2359/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3517007f9e055b60f7c6a9b2b33822dd50d0f65b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2360/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 777f43c5cde66f52149e0c45ac58cdb9611ecee5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2361/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 144d18445724d9c6c8a078cc56c526c152c7a38c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2362/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 54782cef5567bf881a64779ff118fa5d4db30ce5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2363/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 92395f0bd562262554e70e31ce8a1365b63226d2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2364/3081] 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 355c7fe4d2c05f61f921d2de1a0eca448495a942 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2365/3081] 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 fb4b6a0756a74f5da2c172d097e8272726d7e0fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2366/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2d631706261656d4e632f6cd949ed0f063b9b7d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2367/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7c892abf60c4526c0cc8a43f321812f734876646 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2368/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ee7a730dde792189b6f1f22ce6b362c8709bd511 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2369/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7ee8301563444184383de54b0629a34a64dab4c7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2370/3081] 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 30e4c9263ca85b773f9450b0524f2b27ec4b8713 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2371/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e07c24b56fa0bddecfb34ebb313db8c13a76024f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2372/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 968fdbd1bf8333dd233265d60cb610494d424744 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2373/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e6aa236c722b12d6a58b9372e794896bd7670265 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2374/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2082b34f0a2248945850021a3931e8833d439ac1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2375/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e9000a90ceeaa3782b1b3622e553ac16c461881a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2376/3081] 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 8b48f3ba366b9a4b237b5774ee4022678c49596f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2377/3081] 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 d2baab0a902f652f3174720963e1a90e04a0a401 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2378/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 91f96132c08f10ec5c9743bf2a36e7226a5a8213 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2379/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 555b33c34bd3554d99e0143b12514e8804bc9891 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2380/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3c6235867d5d19940159d26518e9ee68f9688fc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2381/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eed3ba2d03a061d796deedd94edd0f80490a6d26 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2382/3081] 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 07376ec3e9881ca8da775b08914dfcdb1edac4cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2383/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 529926fe00b58fe14153ba4b7aa1697549552236 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2384/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3f2e93c89fb048c07b21548e6b5d6fc9ca9d0ff6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2385/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0e543521ae13ab262d1ab9ee2f1a98e0940cc796 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2386/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b7d6cf9127209c40aa60cce1ce4cbcda70ebf74f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2387/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7f8bd277f9011198169b0cc69ff37ca7fce5694f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2388/3081] 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 7302632767959aef846ececeb5881288a5a3785c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2389/3081] 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 ea8a54de1a4db34078dc2f6788675719b27de2aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2390/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c7bb7878fdaadd6beb57b98d3350bf0fe26fef60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2391/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0887d492039e58024ed40a84f95962a96b437536 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2392/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 43539b50c5541b0eb6c9c427c429708d13338b7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2393/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3039dd46112ae6eb06c1f198a818161fb3f165cb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2394/3081] 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 38fc6251ec89d86f8ebde07ec8abdf565a8b6cd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2395/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8e230050687a42449c79e6fa7e03cbe7ee93e1f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2396/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8c632e7d9fafe7ef05d965b6f1acfadc0f2b1598 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2397/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 54609fef12f066f32ce91d2e541383d028ddd34c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2398/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 241ebf7bfb717fd00f7474a627b1cb10814af886 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2399/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 30d5009381220368616d3a97cbb751199be056b2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2400/3081] 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 4203c2b17896470e8ce2fc53f494910c0b7fa080 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2401/3081] 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 1ca16b84a7a82c209529018f4d884f86474e3cfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2402/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 69d1d095fb5ab69f83fb1a360e968280c0e9160f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2403/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1a9ce0f1bafccad2896cd25b784adcf1e305661b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2404/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cccb840edb0fa090cbea6edabc89aeb147a31238 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2405/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 be7ea03586a40e957723ff267a81dc7d4404939a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2406/3081] 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 a2317b4f18fd22550ce71ff08f3ff76a876bba05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2407/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4c94663a3ae9d8673c82ace5b59c4b97031d8d43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2408/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 580425092845495b741eb31e02f22069dc8fd514 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2409/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ce2fbeede03a5e1fdca1f335cadedbfcaa6b9bfd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2410/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6beafb0e9a9b4562e4c6b29481983332d8d577c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2411/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 81f9b5ddbd45d1e5b5c8e0a5ce985bda4c25f91a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2412/3081] 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 fd9c58baa601eccc296a71d6939d3c6218c0480e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2413/3081] 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 71120921234d859be602cdedd4c8279402718098 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2414/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 48e0f9626f3f42b22ab8646b3e129a74757155b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2415/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b72c84546263a724580e8b62c2a9950aa4c5049a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2416/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ebb810e97b91ad241916cb4dab9098e9f7a5a60b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2417/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12be0ed16b674f9c3d391a289fff4b61f25a9763 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2418/3081] 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 072a211dd7c9acb7deb954a7001f5b294dc90c9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2419/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3293d6ba6b5b9f7bf99d3c43149a64781038413d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2420/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 640d904166673d7b32667b4b3fe60948b900d1ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2421/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 89669b29e75b18644e572eb40548e92163258fd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2422/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fb45e7621c4d61e7278e2bfdf0e3728e798d023a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2423/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 494118443d57dc60e2ff56b2cf53d4e8451f3eea Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2424/3081] 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 ab8319b35003ee6daf05d908f65384c7fe5e4b15 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2425/3081] 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 a0f53de594d10dc3827982009e5af5f84e8bba54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2426/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0671f3614d04b8cd6cdc45a0707e1cceff9480d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2427/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e88fb6a4ed13d0221f171a854d0fe2906acfef18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2428/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c15f1c1fb1a1cbf9aa2a0b3505d684ff078bb414 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2429/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 609fab5caf64b63f2a60a0f1fd6a4fa975d4b3d3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2430/3081] 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 9e2d800fbfe18d92026eb25faf8d051756aa687b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2431/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de694720e336d420c9c6928d482ac1e947824184 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2432/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 65146f877583fc4a14641e86198d9d23b20d175b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2433/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 db7bf9a1ce45db03d997000e6cce8c2ab76e10b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2434/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 560077d51211e4beabfe0e25cb210b0db8a03536 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2435/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fdcdba0bd787c323cb5f633981e2c7aed92bba97 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2436/3081] 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 04d1853bc54f84910eae6647dae070a46fc88e87 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2437/3081] 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 913616bfda7208fa8df08e3afd4a5addcb588409 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2438/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b90eb7097bca6f1cdaf69e91a667ac053d1ca2db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2439/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a7c175ab82222a7b3efd155097626fc778743a3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2440/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5ae6d77f298c3781e04357aeb6248ad997b74728 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2441/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 270b699587682b1b48add96ef457f6cb7cdeaa61 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2442/3081] 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 3c1b21f6ed19406dc12d2f169417b156a3f099d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2443/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b38f5def12173dd7124dfdafbedfa1451a9c3850 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2444/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d2984ed52164d6eb3c737fd7254afef18fcbf244 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2445/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b732121290df6c33880468f8b113672a5e6c5f52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2446/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f507c25b93a9b765705cf9bb02b0ebffbccbe543 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2447/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 93721de946037ea904a8b4b5cb481c8513eb2754 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2448/3081] 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 d5be44173e1b60be25c0ec8f2a51d686c0ff1b66 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2449/3081] 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 6eba6b7a9b508cea9abf24962e3fe4de0f45796e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2450/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff594cf8fdb443f489e1909307b43dfb3d6cfd7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2451/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fd918ac35acd8ede22ca2923bff24838d523994c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2452/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cd937f996fd96a584bdf0a92b620739578609fdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2453/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff5e482b7f3bd5f62dd1d01836890897fe4aafbe Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2454/3081] 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 1691c6ab40daf9cd0964a90d53bd1e7d4455dec8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2455/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8d5cd47203f22939db70aac21dc83cc945b5c1e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2456/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4db56bb4ba7de774cf31e4a89fda18ab6d7f9117 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2457/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1b44f3761a61367003c87019ea1be7536af730b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2458/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7414004d1e050353d118f00f43ec204eb2b63306 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2459/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 86ddfc9f5912994961b72ff5a580eaaf25fe2c5d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2460/3081] 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 aebc8d403369b17997c587edfe494e83f154ecaa Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2461/3081] 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 bd64532c7dac7faeddbe385e6f6d71fb18c79076 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2462/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f6bc51365b19f116826cfa5537c53d942b1504c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2463/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12bdcf59a08c77530b3720ad2c4c270e7b65b828 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2464/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bf69f5c0e7898fcd5d133e96c4896df65d43896a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2465/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4a5015cc808c220b3cfb900eae5a912266ae40c7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2466/3081] 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 7cdef7623c255785582c274585fa404f16cc029b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2467/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 334be13c6db9b525e74380735673848c369d1274 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2468/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4c3b51817c0954599a264a5bf0b27eb0d3b4b8d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2469/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 782c382dd886754dff34b4c89420357366d3ce14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2470/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a9a7dd5ee436ef7bba35a30fdabef079c06670ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2471/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4e11d6183b06047af93abed15174dfd055f13779 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2472/3081] 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 87e83362f10b28d1122d9cae146540a05c8842cc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2473/3081] 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 83328e59ac62c4533aca73c1cf1d91b61dc3be97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2474/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 98940d51a144229957ee0c087f73f38e04a1cf4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2475/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b01f603a544413df1b6f0e97e46485bcd7c82255 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2476/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de3b04d38070d44dabf0d2cd2b157469c7041ae8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2477/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ce8f6868b70cfbd7474ed40e97067637d3a2e0a4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2478/3081] 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 8219ccaade48e79433ecbc9357bc2b938e0804c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2479/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1f711f7d3fb64eaae7050c000745605d36a2981b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2480/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4ceed134f4c50f8cb15981787724451c1f87d7a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2481/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3f83df97b2a873d304575cf25d10915be7374adf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2482/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9f7ec183378ccf49bb7cfef31a31d2c0fe449f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2483/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c4c67762a4a1bbe5580c1ad2e4bb5c6576ebce36 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2484/3081] 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 d5045a9add35a50bb154026445ed9d922cfa0b84 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2485/3081] 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 304c6359c3be71c02050309494ba41928bf13249 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2486/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2687aa3c7f767825bc6f46c2e179a63f3a10376f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2487/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 56a692f468f7ebe4d86d0b27d21c1ffe4f8ac97b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2488/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4f83b9a95cced4aa420a6b69c67bfccb73ea8d51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2489/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d1eba5de78ed2204cc2615caad860a2a5470cba0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2490/3081] 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 ef6fc58fe393e23c4a9bf5750563254c7ef48168 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2491/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f981483b3b9451bf643c5b4ac83dee077b0c2aca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2492/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1edab294ff258c6f9a70285d47cfbe8a47221bff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2493/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 36f6c05a7bf16a8d2c000911bb89bd808c810b48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2494/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a3a0fdd8a95da6b5e5d11f20cfdce45205ccf59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2495/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0c2e98bbdf6daeb54b869680fbe6d0fb5155bbc6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2496/3081] 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 c5c9e3721ea7f553fa92ec0ec45380002e7be339 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2497/3081] 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 726cad970e125bc0196395c1d3a38aa34ebd0c47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2498/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fa67f6c694bcb8aef793e4bffba797ec3ed4eff5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2499/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0832868afb561c57ef203f67345ae3f48afcc9ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2500/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ee60d050a05776d6813776fc27a997ddcf400685 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2501/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9a6e82d74e9b727dbef571ff4cb18fa1da0d6a94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2502/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dd3ec4733d8ac4837b97b02b549ef32138a153d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2503/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 935bb15e50cc41efd096490378520295173b540d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2504/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5b50cc8a7ab0e170666e00269f7a1dc0592b64e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2505/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7ec1107108e03895e86fdbc1ef9a39e98ff6aee9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2506/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6522e0b1cbb785e0f6580db9d4e1e0bbaf3b3ca5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2507/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f0f65db0626a56782564070a36bd3b4b6b1addd4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2508/3081] 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 4710ff9e7bc0b6b4a958d73dbfb77825f82f56e2 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2509/3081] 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 fe8c482dbede596e0ca3dc88419579ba5096ad72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2510/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7b381e2a3dc5ec3dbbf5b9af8088fc06fbafde76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2511/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 16e6a81d490db75840a0cfe862049a5b169fd6ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2512/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ece7089007319d60f94c88205f1ccfdae9ad9840 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2513/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c98d55cd3989085fbb3786c693e2078162f30e8e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2514/3081] 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 5c43c025acf8da8e662ab7a60d93a21b582e43a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2515/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 795ba79c6c9a0b146f4fb96c7f81fec2a1a7848f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2516/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 22c27e135a28cd89d41343c567ac56b51838e5cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2517/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 70a944673ec30a1430d944022b173ce69d5d61de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2518/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 80fb1856f400ce27ec9b12ad3fb34fa91e6579de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2519/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 81c3c81b25dad55590a21c0e6700ffebc4e895a8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2520/3081] 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 9cc3a62e045834c3169aad8d95bbe14ac8f7cbc3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2521/3081] 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 c1e6a55db4735515e5c0c0c55aca184e8681ad47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2522/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 90e81e08fbbda8de0790321088d5348f84c0d42d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2523/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b36eb1e33eb083dc2579bfe3681cf8e3dcfa6397 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2524/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a5dae979b03b9d2d3433bf2114a520b37980278b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2525/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 275936c7cfaf75ef8aaa3eba35e9c8152b9e521f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2526/3081] 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 1f63bbe82e3eff40c18f93473a0951c0299c49d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2527/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8fc59fc5db6f8ebfb587c2ac20f4a74f3115440d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2528/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 018eb4207eeacb1c7377feb810d8132b8de52400 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2529/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2cd49a1534a5c7a2821e1e64c0cdf2c0ee66b8f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2530/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 03a29fd0b56e237f10b9d97b3b470e7924160b64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2531/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5bcbce7ea938e182a67ac2091c7c930cf5c48038 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2532/3081] 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 1d5cbeb6135e69a52e8a40e46913b6a89bb22334 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2533/3081] 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 108f832909e5bcdb55cec0f5e1a061dccd67f2cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2534/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cc399e447f012e554b745965cc6cbf6459704a2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2535/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 691b5974d9da13c642686c633c78e672a242c456 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2536/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e11a0a4babade1b0c0153642845200188dd8602e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2537/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e9b20033b51ca51629b592c5f8ad6c8375c5bbce Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2538/3081] 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 e5b59ce12809ac86fa6982908594063d90b8b90f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2539/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b0a5beeef30838e122a237ae8393ce05dc7fd3e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2540/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 507612493a64a0f894b0d4adc96da6eebb6f14ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2541/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 01a98f51075c649261e8f5cb2676938a31a10483 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2542/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2bf464e5d56e3d489ae9da880d5c9aa69ac81542 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2543/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 20ee370a319d7fcde1ae3ef67b3ea02dbeb18897 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2544/3081] 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 c1f0e78dba758eb85f1da3e85f9bdc4e6bb7c1a1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2545/3081] 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 e4065534ec59e4678367af82ad2309920af0e9a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2546/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 998e9c365c9dfc4ef2344f2a8d62c7de88ff6696 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2547/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b00fc56cfe8628c65d768ad6837ce8f948ddb7df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2548/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5b4dbe27d85e67544541c7b730f344d1ab87d6e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2549/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1d212f0fd27dee0207e4d59b30ec61b4de247152 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2550/3081] 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 57b89dae05d50dcb8544469e28af476850ba4ae8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2551/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d616a1d58b04107f014102f1221e7e9f8b152bf0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2552/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 008fe76dbb393d008dd20c96181dc81c25cb87bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2553/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e03d69179716c270c418a29c3969757d3dd8d3b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2554/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8414c780833a994e4497e7c7e985cf52cef0a8d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2555/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7b293da42cf88f3dcf15070fe9b69112c8214cf6 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2556/3081] 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 35e7ce256201940659fd80c161716f678ea6fe19 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2557/3081] 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 d81c2ddf0601327a8daec8cdf8495b02b3a4c7ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2558/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9029bc9a763009a20851da13afaf056635b7ca33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2559/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 649f830093a19090605e500055ca02d6950c4bfd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2560/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4e0cc344f6dfa79a2c403245d767c226ff403ff2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2561/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 894c0b0666bd20e19059e9607af161f29161d200 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2562/3081] 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 a7e64fce2afef2d549bb4374abc3100228050c10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2563/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0f4e2ac8ccd25ca14a475f5970f4bb227d556a81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2564/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 10bbc0231f533f9eb39ee2d32aeb40399b65e2cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2565/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e43b6dbc6d4e56b6afab9f8f1a1a82b857bcba3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2566/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3df558263809d5932e22c46c581a9468c5307822 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2567/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e4a978b2bf7a626b41063b312a1039bb0f417f7e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2568/3081] 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 dab734256db2eccbb9d61a8db6028afb62b3d9e9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2569/3081] 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 09eca3f0ba5a0995e300d7630545c5830f19d275 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2570/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5ec1ea4419240744cbd7a4ee9b80a7a9fdbfbb01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2571/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 690ffe5db903d0048ffad2f8c1fe5366065163f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2572/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ce6d8c47f7665c5824e56e851b645431babbf838 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2573/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2b707589a20b1f8054fcc6b4442e22a55ea1fc81 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2574/3081] 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 af7268c99428568354e2bc741248ad53e80bc56a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2575/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4354a5b7d4fafd0aa06878e1f91547180b2122c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2576/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6a4fb8c38f5fb1ffa37f0dd1db8ac86b8625faac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2577/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ecf00b47248853886c9c398a1c12705114603dd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2578/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e3593baa386c658e869f56a85d6c96c811e43b92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2579/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e86958148d7862233ade89a19cd41cf981c903d7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2580/3081] 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 f62aa99c08fa36d801b44e573762b43ceb1fd043 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2581/3081] 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 c4bb0336f03d9d4560f2d426e5af49aa4d4953a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2582/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 06e2a14dc3da31ebd6338688e461aa1f7cdf014f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2583/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 45e57d16377ca7fafd35dd6c7c7014799bc14cc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2584/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4efabbc1488d9da75d52379626f34f6e7211be7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2585/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bea42755b8605982b206b31233899ddccc272213 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2586/3081] 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 b3a6cbdd6a2453159a8ee18cfcbfebcfa1c5652f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2587/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 02fb901fe2bd02e63afc061eb452075a274986a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2588/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2210471fb78d2f4a0ae1b1f173581fee8ca9fc08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2589/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 933ed76260b639e07de7a40509728f9db2a0ff58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2590/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 904954df5e4b29970fb5cd5d498656857bccc502 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2591/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cbca3ccb5b29933da8c7940d5e0f3579023025df Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2592/3081] 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 5d2964cffec7ee172b3cccac87964e624f79dfa0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2593/3081] 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 8263fdcdf0f452439aec374447656f1be2048d95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2594/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 25549e6b97d219d4a13fb153f9a4048b259e2603 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2595/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 15f249d7f105deb86e8f93722d0ddb0d10866783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2596/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a6130767c9a6ad89eb9562f836b405284e612270 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2597/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 39df07f979c17597506292f84f22d481a6320da7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2598/3081] 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 fac070fa542b8e3d4f038b318fdb0499f1eb12c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2599/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0b733b717cc2ed96bec514a91be9173779a7e520 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2600/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 36d03e9127cff997bfd3834f940a9e2581161a36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2601/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 274e59a28d645b97e9802c2c8ddfcd1134a8ffd1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2602/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f722fbf7c808b42623fd17f37935f63cf1f056b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2603/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 10a2456980b68f4e01a91ab725ee2b5e2aa5b17c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2604/3081] 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 60877e9f4858f0a824fcda41c26603cc0d030df1 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2605/3081] 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 72d627f58f02b8613dc4bb8f8cd92d53c5b27531 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2606/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c07cc563de9fb85d04791acf4940a0f39ff764bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2607/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b24ba2dab202d0fd45e7c046ddbbca6a46eb579d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2608/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 17b9df59079c5c3605926e34f07ee04756ae5973 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2609/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 20db193f89a425eb758b463b7cb80bd5ef1ec59c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2610/3081] 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 8c6d7988b69731ec81d0918736e85906ff56b5e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2611/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cdd1ac5aa4c9f2fc08cc9b51177ddaf465e3c48a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2612/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0b488e5c69dca086213eb72f20f628e1868a0cce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2613/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 75a6f5b0399f614eed35e9461eb87e91ce321e1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2614/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b634a89d2908773b15d76e1716b0c066dd8c4de4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2615/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eb5db8acd9cb93e054ea91d3eb1dd1bc2444db2b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2616/3081] 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 68b681498894ea8988e4d0f531d9f8d5b3649604 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2617/3081] 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 36f452f3e595f73e783ed89142392f154384e4a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2618/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 62f0e9fe76e6f50083ccae77f9d3900648606b61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2619/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d72fdfe4232c0c60632ede71a21a63df2ac5b8ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2620/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7570b1496e709d2f2c9e328102c4a35b295e4873 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2621/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 812fe5a8700a083b20f4c21a84a6eabec910396e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2622/3081] 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 9e4eeba018a3179414b278af66c0944e3a414b45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2623/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b4ac2986f62576f8b6e141488f79b8ae5b5df246 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2624/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1942f7f2255d2b6f0f78ec9a2c9cf1f28b08b26f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2625/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1cbb63e90c01c4f60c6030a5d324aa6d90841d23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2626/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 20aa1a6da57e235bc3a0f69bbb39046c29992d7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2627/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d121b0597abcd0348f507cb419e634dfa452877c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2628/3081] 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 26e6580237ce755b90a49f962e762a7c6708f0df Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2629/3081] 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 2efc95388e67e549fdc795620cbdb53ab98ad4bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2630/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 44729c716c7e85936f4e65e9285ec3fb635556ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2631/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b8b7c49c0bd7465e55955fee636cdfb5b2b16f2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2632/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 36e6b54428fbf3304d62d81c8cd98c021f49eaa8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2633/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ca549e993b7680a457cd6a43dc866deeecb527ba Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2634/3081] 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 6dd7a737beb3ca835d920b4670311417c35d9d75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2635/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 420d318940a03f503a223d84f5b401bee7c10d5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2636/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 00042d34dd369d91d4e3423f28c0fbf09522e8fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2637/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dd7fc002dd3d4e4bc63251c8613c17bcc7e4ad18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2638/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5229b71a2bb5c77e5d390ead4d6d8e06701321f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2639/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 04becbd1167d3bf4b6ee57a03d11c4841a46665e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2640/3081] 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 2c4b5a8475e2e97e8e6f2c7b0fcc72efd6eebfc8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2641/3081] 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 5154f97723ef21bcc7761f45c52152ccf7474013 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2642/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 42ae4541ff86c628a796931be3942d1a1514cd1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2643/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e22d8ef54f09d6543f35faddcbc3869d2a5ca80f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2644/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 07fa0cc57f60535da1e5ea24a363b96e23f5666e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2645/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 29184fd704a282f1d23b74119ff8568d8b915344 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2646/3081] 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 783a831bacffa75b5dac08ece677e24c876d9448 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2647/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 578bcd559228d8fd3d62fc4d28dc428e4140c3fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2648/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cebe111b4882b1825d9d07e4748db7308eeca19c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2649/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8825243f4cfd7196531ef6a3e93b117cb066e755 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2650/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 361936283162c5c4f520ef181af4140f7a8e5001 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2651/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 835f166a46da4f21289885a0e164b59e76404f5e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2652/3081] 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 aac6749239f54934823f317b8fd062aeeb063eec Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2653/3081] 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 30e21d5f549998765e5037ebbfd1381fff2d1e75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2654/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b58116ec87b8a0d97348f5e71f9045f974036645 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2655/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e14df0bc0310cef9ece123d5d331d901504ddc5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2656/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1e63bd44b45e268c0018c791460d43e6e4992f33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2657/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 15b4ec4823ce09e24cc25368a8003a1dc92eaabb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2658/3081] 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 055633338b087e6a25477fa64071ec1283044559 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2659/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d45be2ee54e4b36b037e410e01a228cfb72891be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2660/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 39dd9dc0d3685d6f4e1e207bdb34b3354468c438 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2661/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ee7348f7397134bc55c7600f267d0cf7a05681ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2662/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4f171ccddfaa6f471e22af241f10fe54a8f095d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2663/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b6e7ba1297b9217b1923809e1a7a53fdc8064d77 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2664/3081] 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 26b4868de1ec86b4d87f25a7cd7c5c9bb934d458 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2665/3081] 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 cc2287c3d16344e79b309e66aa8cff5ed5b8fa2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2666/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9c1dfd80c929e858eced11e0fb26924ec269c73e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2667/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 71d06324752f864a77cbdb586617b59cbae9398a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2668/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cf0004d5cc1d38ae68424cfe5b65a2578e2935b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2669/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f440fee5a084a202ef68986a95f6b0b0e577b859 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2670/3081] 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 6106a3c24dc25e82a4c0be13ae4c71f80c889cf6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2671/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7eb6bb9808e22d6738e9a1dcae3c2ceb911c4a41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2672/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4828bb9945c7ecb9b5ca4c86716593e4b64628cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2673/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 25f2be2b66a2d4d22c57f9ad1bc38403cbb679c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2674/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 260e45c60a9fdeb1ab416658afb87796f92f0d5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2675/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f66a2f649aba75c9e2c2132bee0e8ba770cd0194 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2676/3081] 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 ccaadef1246493c3bd10bdc5a3ae1dda17358fa3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2677/3081] 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 afa9b9c6ac345cb0ad31f534dc838cac677cb65f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2678/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b1fc090060c6843e408df93cbcf0c97c2da2501e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2679/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 939d9a7f735c14c3feba16a7fe511bbfa2920e19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2680/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 439619b88c8608559a09e35f9ff29d2a75568721 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2681/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bded0dee7088d989301605d2dfff9b28ba23784a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2682/3081] 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 0cba84d487c7217600801e270d1eae95fbc5c8ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2683/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7e13a7989605b778dc923dfde4b0dd6676d381e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2684/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 59a80cf6fb8fd26ceb5231ebd4b46486aeccd790 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2685/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 10d157c5580bfa041ac4874d029d50383c7e856a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2686/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff1b428c9a1450f11c78cb54cdb26fc557cb8b99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2687/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b799cb6094abcb247bffd9b1761e03590df8559c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2688/3081] 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 d9fd4c84f5e8779a064043ef20a83a282beb232f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2689/3081] 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 4ed586fa843f577f3bf2f4590b3676845233f347 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2690/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0fef8c587bb232a222b79653e9446aeda8110fff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2691/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 621b8cd79eb7404e9c619423e7294d23727d5540 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2692/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ffb85c2238a2eb517d413d1c7aaabbc7162459dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2693/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2f29aca402490271b848ebc84e82abb8193ea150 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2694/3081] 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 c4d4667054be947756444f4470079a1912d5bec3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2695/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e183fbeb252a771308815180526c5e3d630c3d86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2696/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0fe3788fa57c389a50d48925843013c4ad323daa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2697/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 243074d7c278e84544181e7318dff30e33c34052 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2698/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4481ec7ed48c4466cbaa08d96920619360d53090 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2699/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 515f5893609ea698fcd5261122da84871d5940fc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2700/3081] 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 42f2f28bbd9808e53bd2dbacf1fd8c9e95e146dc Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2701/3081] 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 495835a9c8795a8b7b015d3ee954552a8ff3a0c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2702/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 02723815ab9623439453010bef9f6b5503647777 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2703/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 767c9fd6b84acb7c282cd1f75f55ef5c6e0d8f7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2704/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f913932e30324fc4ac6b675445b60f0b02b6b4a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2705/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 31a0c2714cb82925b2f200c08bc7c3d96c28cb70 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2706/3081] 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 4a091d59f477af0d9daafceafd77876f3bbdbc4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2707/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 310d0787fb04605e39b40245656eb77871f0860c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2708/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9b50b376a78eb28117d075894736a037f327346b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2709/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dca5b81cfcd637c8c097d22c5923ad213b3f82d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2710/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 40571ba685f69fe6eb899ee17a324de6af5fd1d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2711/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9303eb9494385e0ff6532e65d9cda476d9addb02 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2712/3081] 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 82d1c2e8e90e09163834b2e19f30ef09d5c8b499 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2713/3081] 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 ecffbd643dcc1f42d5f1cdb1c807e07794ec79ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2714/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 10e3a4bad1f29e3b216725cc86aa976984c2c7d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2715/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 58abdce81f1f0ccab950bfa1bc8b054b39cf0e19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2716/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f3171ad185c3163ddb00b431c72b86f68736e00d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2717/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c2b53cf7201e74d630c91a4a37383c325331a7f4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2718/3081] 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 c6ebfaee1b854d29ef5fb03325c297a4db4b58ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2719/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b6499d5ea30de994f757358894cdfbc2d395487f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2720/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c23050d3e6b4a8cf233f882213dd37e62c114904 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2721/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 92926c630e007e67ff8925de5647d8fb26ca79fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2722/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 041c771e4ed7acc175708be5b6fe9bed16244dfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2723/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0d7163c434de86c6260d230af380fb07421355f9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2724/3081] 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 28c1553a54f9ffad00e0f68a83a4d4d9f1bce8c8 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2725/3081] 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 5face94d2bed5c09999903f78dadbf271868cec0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2726/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 69039897a9676958a949e256a20f930c3a92bd3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2727/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 96d4f458f3289daa947ebee046cc216439c3f77e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2728/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0fe8de1743b5acfefe05048694245642e4ef38d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2729/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1fdea0d1dd234dd9b33c17aeb9cf77be0b0489e7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2730/3081] 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 6b2b924f37742c7ccad39a2586fe052212c10761 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2731/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1cef54b8a9b3382ed9d8b717bdd2871cd97e4b5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2732/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f1b9ee18dad7ac347f7a854cd409afe41c8690d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2733/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b2dfaf8be4c0a6ea0c8e590d5a5f6582360ed342 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2734/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4c17a05f4711f73405ef41837d1c949a7e15f566 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2735/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2724dd9c26e4e4df0b7c89740d06a18bd91256a7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2736/3081] 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 402a2c4f67d01717788435e46ba467f15321079b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2737/3081] 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 299167b218d9c8db0ea8df21289d24177981f2cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2738/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 221094e1719c186776db516bd946e566545ff87e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2739/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 990284adb18dd15e26c061d28bb26cbe25a1e5e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2740/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 33e63566748421c482deb786c6ba5a7c687e5665 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2741/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7ead6ebcc663f5ffb4d5fd8bb61da270f062d718 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2742/3081] 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 8a0deff4c1349d0f498511fb3a82e7003fa8eefe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2743/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a33619763d094c5b5c9451e93ed395c06556fc5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2744/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 154ae2cd23f2d0cac5329a198ed3cafa53ea9a4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2745/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a739fc5cf14d34a2cd68ac32c711d7518ec2028a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2746/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6e10c4ecdee8c401093b3f8e95047c69c3ee517a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2747/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 874e4e29bf63c45090ea1d124a6b14736ac7254c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2748/3081] 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 f238f263e3f676a1ddd87b0cd3568d6bd0a33d8d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2749/3081] 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 545e7f33069120f8929189e560f3a446394c2807 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2750/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d84d647b04e637f61704d24888b5ca05844c00dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2751/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1fe78cb904d81694bdcf2154ec03e6c9f5a15d9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2752/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c9c2338a7058b3bce3c327400e149e097316b013 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2753/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cf203fc2a83d212c029a710b60fcd5040647578b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2754/3081] 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 2bf806ecffa41130599f69294bcdf43874db965c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2755/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 59f260b081820ce4c212a40d5e17e09220190f12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2756/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ec182a3c38e2dcbfbc63f27d70799ba108fa6180 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2757/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b7576e82eee170fed9c102421355ef38e63577fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2758/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b29e816547c6140387d16c4da5517c640561263f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2759/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 36e27ea334a21209fda242f80a9f5ceb6832959f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2760/3081] 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 a9304e45981eafe77d5f3d9dccfb13d4ad7405ff Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2761/3081] 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 ffbfb84f5e35045e84a4f42931ae9b63f71483b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2762/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c1c0920abefb13fcff7ecac4588baa130bc94552 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2763/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 42e64d33bb2637d95395b8de77d3a1e4bcad3e77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2764/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5950ba787f363ee989db652613d6a331e2f5d532 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2765/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e41ce780efc2c55e1deeb2f4bb4266ed0f047165 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2766/3081] 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 9c06c03b54ff51a024c838edd85d3941baa40520 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2767/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cb5043e3fbb20800f7cc228cd4d5cab6693c80d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2768/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 da2c2c5b51aa580bb1f8bc09264c83fa422a9362 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2769/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ed4a6cd7c49f4b3b90e202eef0c0ce30d0b7bc10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2770/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a5fd503a5459c95a984fcb32c715e8a6924543bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2771/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 31119f76eb63f75bff63028cfc90a181dba847c5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2772/3081] 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 a63480e0de9c22389364e040bba082eaf60830dd Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2773/3081] 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 5838842e051fddf27d1529b8cd28af7fbb9e995e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2774/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 642f268ea252531749f06c4c8a811e36a7e338fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2775/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 877f316cfdcd39e73bc489f4255849714d0d4ce6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2776/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3a379f088ba4a8382f5f9e28856a13fd6c789163 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2777/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 267fad1e6b1ac10550f740e82527729e2f48896b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2778/3081] 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 c064371d639b5a3959a53c9cf69a50226d531711 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2779/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1a1aa14d815a6ac272cbcfd8585f856bb52ec81a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2780/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3e6088a31d1c1ece17223bd548d38499858f3e3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2781/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d05aebb153d910c167422ed8e4ce3d9a84f719ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2782/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dfcf0706d44e4fa7ed6c1b72d47320b8e4f56ee6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2783/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f99ecbd11e338c62fb2f94eeb9f759997a064fb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2784/3081] 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 50ecd08cd133bebe995334af8720bdbd23d280b9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2785/3081] 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 f11df8dd76736c6283bc4b6ecf579901da9f328c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2786/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 adeae4a0e2c04f44c35faf71715cdf3762c70ab7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2787/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b2af13133ac228ac8476b28301f4fa39be69f2ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2788/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d11e33aaa390512fd38c97c7f9a464a9730c530a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2789/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9e45ee02a7eac0bf1f4ec7dbe97ffa4155f5c44 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2790/3081] 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 0350faa6a34009eff6ec2699ed797642c0632dc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2791/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4b4305582c821d44b7d20357d3be06cd7bb121d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2792/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6833e91ec24a0ad1e56541d34259d04c0a8c2b6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2793/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c1822bea08043d975caff5d6f22d91420cb237e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2794/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 57e3ee15bc1efb36c5de4e1f63ffbf724c8ab7b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2795/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 11b85fe81a18c80b9086745fcb331029cbe04da5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2796/3081] 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 d576f1d7356d9ccddb429afbf2f2f810dc969a46 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2797/3081] 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 9fd55b499c797ed33af7ab38cd93d5e3693debc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2798/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4851051484b1674ba9aadd5a8126e09b0242778c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2799/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b234347da3da77600884bb31112d9cb736d0030f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2800/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d8ba53e99a11d88e964d3bbfcb61ef793ff4a3f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2801/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1cc6519c52bfa93a228f04500f021eb460f82239 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2802/3081] 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 4ff9cc93be5fe65a1d972a8144a83da12f81df3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2803/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4a9b6ce2e65250d45b8d346147caff168066f94e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2804/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8b5663735049aba8559529546a82d360cbde29be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2805/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3332ab75a929ad677c190cd742e8911dc96e2cb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2806/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1d2f8dfd4832dd09e62867237fdc176cbdf0c6d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2807/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 be837d44f8d4a0796b1d195c0828cad2897b0afb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2808/3081] 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 69c99aee20934dfd63d86189f6dbb12863c2f4c9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2809/3081] 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 fdbb4e16b52f684ef004719e30d6833fe2b556c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2810/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 703d5a04edd39e52525b8125b7eae971592f05be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2811/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e709db614bd50354ca8daaf3bc636bd8473ae40d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2812/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a8975cbe59a7fc4d7babacd51f19f5518279512e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2813/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f3701b87d2161cca2b41457c4dee3efb5fc3db4 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2814/3081] 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 4865d7da0d0b5b66b1a2becf9f3ae7a956891df5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2815/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 df420e3848ee9886ccb863dd1bc7a528521157d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2816/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 10bb7089194156b85fdac458f8e976b087d848be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2817/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 510d0e6cbd6e7693d829cce6fc1309121df8aa3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2818/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cb2c270b86b7fbf24e58b9dfed1ae06303ec63bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2819/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 226a6c8e76dc74e0ea44cb110a7000bc4ae3c767 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2820/3081] 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 88245c9a92a1c5c9b9e4016b5f64e8b4a0683136 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2821/3081] 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 e0f5f7490bfc6125469056d3601950e4d62225a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2822/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 27d1b2fd9bd01e3c8813ca14d0dd3706199260e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2823/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff2b3dd229f5959c6e02bad2d27cd9f1cb025094 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2824/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7c9de844f94f8ba15db4e75a10b63798ad4d407b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2825/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d608b5eac274d37551e29c209462a90620e20281 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2826/3081] 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 7334e056d1e74ba1482d8ea957a74b688bc076d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2827/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 05d416e8bc3db26c22a205e697ba2b6d2947d8ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2828/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 65aaa3ae569ce4d875a97a1fb136c9d79d4e642e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2829/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9992b9f6fd3659f01d0c3d76b52955f13ebf0e4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2830/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5e33006f9ed45e6e810baf6fe33cdee897b42773 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2831/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2ca5b09cb7845e65d2cf190caa6a7e9975768c63 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2832/3081] 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 36aad8a7a38452b966e6b993e53330f809b71162 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2833/3081] 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 f272758bed70f4939f5a3fec9030ed395dc55b76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2834/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 12d10b8b8ee562ea437c3b5c539d684e2b7bd99e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2835/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 70908e4ae899b3700b70cb73559a9ebf26adb85c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2836/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1e5b6fcf3fa4b8d015164059ae9d20c7de72739a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2837/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7dbd535052ae40f409997c7b45e471b641955c1c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2838/3081] 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 10e704cb4fbe4f07c8b9eb93a641f52317887208 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2839/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8122cace13c67e234995beb881e83b87a8da7f1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2840/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5f94cba27c6278f8188c60382e24c38b8c898a96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2841/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9bb5bc49ab6724f14d63d8310662e4882cddeef6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2842/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d9576811809c5618293312c2d2c4264f1dd65c39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2843/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b29e3d44341a1bbb038622d97c0e19e7b063db9d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2844/3081] 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 513350ceeee367bbdde508f72c8ca9d0afad9b34 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2845/3081] 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 d81b300d05482bdb0f1dd25aca1ccdb728e9f52b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2846/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6758480311f6974c25e420594f572e925eb22c7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2847/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 abc2ddfc7e9aa0f299359ddb86ea5f5718b590c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2848/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 779f73e187fdb4fc2bbe5cb6fbb1b73744441426 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2849/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e1d0b7f5fe4f5faf44d2a89d30eeb36fa41c4b19 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2850/3081] 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 422f853dba3c43070051b08804bcc5acecf137c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2851/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4e3bf79d81e86952281a053e73e30c85ff604987 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2852/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e4248024941974a1aa224458972a639c62af9303 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2853/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 de59523bf5c3ecce7503208a129d47f6b9b96e2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2854/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 66d8aa8b95e923992b86370064c05d3e5a68f995 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2855/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8ecf789a5c262ba5d6ee904e70b2e4b71e9a585f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2856/3081] 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 7cfe47a292e95cf68604c7522bbf5060ca3c4a60 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2857/3081] 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 efb2240184462915b507a298ac74f4f60459e24c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2858/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 374f5f2748c5eef0c93f59163a24fc2d8b003cd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2859/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 34e0a99fab172dc7291c0fa81361a051924708a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2860/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bebdc348a94b9b3a0d469d50148ad27663d988db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2861/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f72bc5abf7cc7ebacc50a27eee83e980324b4528 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2862/3081] 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 7be79aa651d23bfbf1431a508ed1e2b572e3e39a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2863/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6cf3a2e6bf6ea5f475ef1474a73a9062781534dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2864/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1278d5408fa1da1b9dc8f35b073a33fe4e4e5cbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2865/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 3488eb8d3834ed29d9cac11069e46ebbb5b8b7ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2866/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d89352ac15a2bce70c6ee0bf0c31911d9ad945e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2867/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 364564a5436353233772b27ed2ce73f87f20909b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2868/3081] 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 8429325fc092178f72c2f7b1bbad470dd0ff8611 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2869/3081] 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 6b4bebc36b0c37e725d39faa5ecf975311326ff1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2870/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fddd0c068cea8d23cc04be06ea72b4a5d019357f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2871/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dcf0f887a58e33d9af6a77895424c581a4ad9eb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2872/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 622b138e02b17ddadf065de5ace3bad810a3428c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2873/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a59b3e1ea7074980ec1d1c8de42984cfa5916341 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2874/3081] 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 76be750fa47945e33dc5019a7a44f3b7a89f14e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2875/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fa1b624c1a71108f75979683020cc851765e2040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2876/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6d738f155609c9a5db7e6cf6bb904c35d739de0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2877/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4f905bcb9070d31c22e1e797a5832dd2d41a1d14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2878/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a2ef238d8c8d4a56ac5f051b05d0942552f52430 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2879/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5cc3bc5a5501f8f32b79db9800746b62ea9cdc24 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2880/3081] 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 ebb115d42e5ba5a18512cca4f9ed921b245a79ee Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2881/3081] 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 9c2875b7b680284a766cb9271a2ad98c3b343993 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2882/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d6c9f69f834a927b0df9497fcc885edf86fa7a64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2883/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 31332665c3534f38f27272239f3f6c74440e8c4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2884/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f36619c9a20648c8724bc9d2b411fbe61db90c03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2885/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e7a27c71b4329efeecc34c9cfc3a4b32822bab56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2886/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c079c0d4dfd7101d77f4105fd901c5cbd0edbbc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2887/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 08c53b43d4d1de5d0b8fd6dead9f3ab327579915 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2888/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8eb9e7b3d7e32f28effd820235ea5919f6f25ab0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2889/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c4c616c1c486a74e22e9d268ec09f81742abdbe8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2890/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 424369eeddc07f7c4d54f4506eccab11021cb370 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2891/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bc2ad097fd5fd9c5ae0611feaf447efd68c3e5eb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2892/3081] 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 4f0545a3ff0c4f0f68c67eb986c8914c37282ced Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2893/3081] 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 9fb6e25b4170521dc634eab53ea03e0a9818a2f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2894/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 be31419d7c2cd6951d8570caa54c0931143b56fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2895/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 da8cb8efcb81e9804829a7143ac5b7e4f2f1b3f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2896/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a6d9eef113be115fe802ece18ceb833443c6297d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2897/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4d785be857591e56f39b5052eba8d7f14b56d785 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2898/3081] 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 943d77f6f18ba84f6dad751c1f960f5e59a20818 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2899/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d84e60adbb1d43116665b24ea5c75bdc0edaa665 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2900/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6e7648eaa00b0156631e21dc395df12199f55b0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2901/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 09ca1ea0be02686d429956c80d6ffe4022410ca2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2902/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d77702ef940557ad596f1a035a850c4855e4a3e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2903/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6052de24b84a03e4eec34c583dd841b108f7fb07 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2904/3081] 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 bc0c56825e0f0257f14c3a89ac570625232f8894 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2905/3081] 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 f7aa4f681ce74f5352fd9adb801d76a8cd548015 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2906/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5a4a3900f57415fed08ab85f2f821fdfe8f926a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2907/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a3c5d8df0da0c37b25facc964743c0a46fe127f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2908/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 82a7003177bbd0a6997690b41bf66da286c9ab4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2909/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f838036e091975f909a8be5b6619da18427b4aa5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2910/3081] 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 0b27ce0291578dc8ab415c92f362a1c9b16122d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2911/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 da0c3ee78ef85c3d7a7d4ceebb27611f97eee509 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2912/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1a3d955a48dc9bbafbc85c6d6db058661b66cffb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2913/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dfa7b12745124f5ab807494764a0456e3f18be07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2914/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b163d92b24ace8db61a7301b24f560b60be80cf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2915/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d6481dc95744949a82e6ea76591a04957fe5c662 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2916/3081] 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 6a0a942e888adcbfc594dc19eb2c8539e7a03aac Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2917/3081] 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 4cd97cfeba61aa0a26010248651980a3960fd5b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2918/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2df0e213f54702a4dc1e7d4aa281c60707cc8570 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2919/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 666caeef539fc90b23b4ed9f34f44c5d5be5fd30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2920/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e3d917b4b1e706eba776d561f236e5ccf1cd23a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2921/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c8483d04ed0f8c99e33db1f96e7b3dbf502bdbfe Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2922/3081] 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 cdb465aed7896641caa62710c96517225e413fbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2923/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0646266840a071b0c532804790d593a67b436ebf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2924/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2ecf96b0a877a0d8235f862d0f26bf5f99563f99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2925/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 917cc9413405ae1c05d5f9cf027fe86d9cabe529 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2926/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 66b178b4a3cde4d091877a4c281868858863f2bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2927/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ead48ca610ebffb528f825f0c9fd9fe47a7cd39f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2928/3081] 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 6062c1519d0932d164963981f5d9d8b1bedc1125 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2929/3081] 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 9c6917c4725190483ff5edb2926d4c52b3e481a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2930/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f9fee2f0e26362fe4bf95af39788b75e97b0f9c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2931/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 419242395f49612b61f014874f69cb4b8ea90461 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2932/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e6e67bdc80b21accbc8d8a1256a63a5921276e09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2933/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 18a6be3db0defe70aab5de9d8c6141de63ebfbb0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2934/3081] 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 9edfbe7cc8b373c15234f25fe68c9c0cdd448764 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2935/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8447b2504a1d118f7ec10a40faab4267febcac94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2936/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9c9af7640c20c439a7f9356f294f72272530e92b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2937/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dd79b18d835e30b2ebcb05b48763e095889d73fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2938/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2737ab9a765da93e64883ab765a69245ec0140c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2939/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bb4685881d6ecf965c97eaa495a59e8ebe4fa504 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2940/3081] 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 56ffcc06c9a421fe691412cdf2cfbfc0e43f7a65 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2941/3081] 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 43ff16610b0d8443b47c1fbeefa8ffef1578de34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2942/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f5ebbd604d6388e1cb308422f16f6f44b29ff93b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2943/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 37789efd7838b0ba250cf8e3a96911350968f8e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2944/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 920aa88d287a6422029b30eb8d12fe838ea5827b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2945/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 145d659290b3d6758ba7a5ca6369d6468b29263c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2946/3081] 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 78c20cb6af5b8f2fac4c8858edf16db3c0aca46e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2947/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cc70851a64c2ea2f65cebc630982f208fcf7baed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2948/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 102e62338dc234a155129e13dbc5799bd85d1bb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2949/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 feae4e2bd44890669ac9d85c1f3ef3d9399ccb31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2950/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ecbb12e0b25643aafb04c69bbf554ce6ec22d8ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2951/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ee2d7c92fd0d476d2bc9660da298834dccae226c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2952/3081] 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 90bedfb8ec0905b9a79203dc319e0b7b9081df54 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2953/3081] 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 cb7cd82a083b7da84bc6c98bb78fbad7a3a55781 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2954/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4adf6da18c67992281bf9f5344be6ed6a8a83995 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2955/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d0646a4e76fcfefacd8a8d6767f331c7cf6a2a5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2956/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d5e8249b0a438a90dc19dafefddeddbd17006dd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2957/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 31ca81af17c77082820dc93ac7ae6e8a0d583938 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2958/3081] 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 a8519076cd69caafd9ba1fe58a4fa87a279c6dc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2959/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 85d3adb121fd7f9c9b9261bafb9a41c4fec79951 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2960/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f721d64edc1176d5b6b955a2800e8476314c2fbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2961/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 00161a512e40544504bd34229f9dcea1fc561525 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2962/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 99aefbf13428ab562a714924591f114d4062e99c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2963/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff26702336fbd3760fd26c3659bb1981dbdf1c2f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2964/3081] 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 a7055ca004af600ae4cf945e6e0c0835cf9d48c5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2965/3081] 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 09abc52887a59fa8e7f0328ef9c95e7a2dcdbe6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2966/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ff593ca2dae8d8ef61462b85d540f03f1083c9a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2967/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 5d5ef48df279b38dc203fd68a9403919bc7c2144 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2968/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a5074b461139b4cb3748aa0fde878ca89661f05d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2969/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 22d3e69d77b93fbbb98ba86b8b27e61020c241ae Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2970/3081] 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 6a440fe052a7c5c87313d7d3c15967c311acde05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2971/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 eb84e88255066d1a7e49f80e35952894007c15fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2972/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 73ab72b8001d7026fdd84a36264a7a384b6c179d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2973/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 60ce485f6475425da08d885c5edbd967983a6d8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2974/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d48ce53d32a70694e17e2cb9ef11cd7c75eb4b54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2975/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ad3650cb1d41376b4ea3833302ce9da1820cbf1b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2976/3081] 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 543ff94a047982cc0c80adb7e12b9d19ac31853d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2977/3081] 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 0efbbf70e88449e3e9795b0dc5fc8dcf5b079d6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2978/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 73501772e6598d1641c9d1b9496b427fabd02c11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2979/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 68586b6f502c4c039e22fe785e2474f58bc3cc12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2980/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cc2da94b18410c72fd0c010496e8681d555cee20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2981/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 41a7a9a52f7dfdd88b55785a71410e394a5aa402 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2982/3081] 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 0ce289f003b1414eccec1e5fc13024a5c8f71bd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2983/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 441e20be1d0b7081854b3399e206c1d786ba0d48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2984/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 503ab730298ae932024f5811e055b674752990dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2985/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6e88762af4ea7c16aab8ba65822e68f95b3a8b19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2986/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d36893898764cf4fce239093aff48c6615a51947 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2987/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 08dfb7500733722a92745ac65eee142619bb1731 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 2988/3081] 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 7cbb55e2650a963b4a4eae8ae1bb3b828c63061c Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 2989/3081] 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 945470a85cfc202539cbb780c26c094485cfa72d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2990/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d7ff58c6e720b04b15dcfa9d7416fc34ba036d96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2991/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4c5448dddd6b0e032b837bcf77f743823bd91b6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2992/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0ac37d5b586035c733f60dca9996939b0b31a5d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2993/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fa7837e90989fec2d5c928aef3f2d2e3639ec8a9 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 2994/3081] 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 f469d8853de3aa6891a2e3a539ceca1ae1fc800b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2995/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 261305639ddb69dabb1bd284090edde49048c07b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2996/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d26a84bc37d8b22c1547a8652310d012eb3e07f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2997/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 705b16d0096b52e39e3cb1fee501f9460be94d97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2998/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 976e22304568e50114c286cf931bf3f159df1573 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 2999/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ddfe78a76fcf3a4d3ad2515cab289f36cdf2155b Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 3000/3081] 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 158a70c2ea55191dc70bfc25f5e9660f77e7f592 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 3001/3081] 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 7fbafb01fff69948c3346b5badb8ffd00401d325 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3002/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 678fc25d52e4665672ca896498d7c3fb52358c61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3003/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 235a035c2f29631c736cf6df2553fd6a96f6ffe1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3004/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0928f9e34d096142f3e6a54fae33c7e57a25747b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3005/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8014b1693fd25bf95a8b0d94d06f06786507fc09 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 3006/3081] 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 abc60bc2488dcf80b81491dd9ce09d6b7253f6cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3007/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 00d5914b13863cb105a373aaec3d508e02c89762 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3008/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e71963f13e78e748e47eb633bb7b7bf36afa2ce5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3009/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8e134572fa8a583725cf6604640ebf732183ccaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3010/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 37ed84a5f1d47491a89d5eeccc86383205713aaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3011/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 8506dacaf3846e36e7c7bf99cda5189ec43df4cf Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 3012/3081] 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 cf1b5518c1153c137eb3ed3546be1b171ce7f456 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 3013/3081] 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 3f755c5fc5c9eae6e381996c6639208157e4464d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3014/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a2013371274a2da3f7518cd8cef89ea9b11001d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3015/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0e342c54a7bfa94ff75b4e69e678b76092cd8896 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3016/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 81a674908c94d332f3f0563ae263d670c294e1bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3017/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 771b5180c591d6fd93103ade8309ff2087683b9a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 3018/3081] 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 ec6bb59889d2145b1be0d06ae2a5290b101c5c52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3019/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ccf56634f3c99f64da77b10679b187c543e7883d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3020/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0278b5154778ed7a33c851b3e0b212338a9ab09a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3021/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 678c6e733033f881f51df936aa14ca22af6dd770 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3022/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1c453f8fa58b86bb7828ccfe7e1a11d3aa1f7b23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3023/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d8132e25fd8fb2fdc0bdca1904736f5d7312da99 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 3024/3081] 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 cc34167c88bd6a86fb9fb55eb77c5f719e3843d5 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 3025/3081] 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 9b15e81f216162c079bcf73199751a12f95dcc13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3026/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d54854918ab99fcd0a21d7e7daaaab5a3837796d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3027/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0a8584b849e74bdd7beb60aaa40e4196ac38b569 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3028/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6967b24caa489cdaece5f8e9c1ccac221c9fe348 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3029/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7809ea68368a1d58ad57e2d6e5ca7dfea57b82a7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 3030/3081] 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 8df801a8e2aae461c93a8d2968bfb5476c1b06be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3031/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c76446318d0ad1e239cf0b26c9eb590d65a32641 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3032/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 58e853c97edefe441eb5ed0d332c311bd01b3737 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3033/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2cc11dd3c82051209d8c3aaaff319ae1b4b25d35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3034/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 a41774717a08e5445fa47312935e30c4d2faf0f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3035/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c53dabf07decea549461e6de0c0b96cd02cf386a Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 3036/3081] 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 acde8c5a4590c7c05f47c64241cf905d7e233acb Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 3037/3081] 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 23bf0dacf67f0e227bcfed2b97a115a4fe61544f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3038/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 e94e46a1313fa7544728c7a5574599a0975d5c70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3039/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7bc303f9966a9faceb5e6b853ff2d08f035e8e93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3040/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 2321f8ae1cb4e6d5f757756293edc214dc049bf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3041/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 f5f17c0c572cf13a5b3aef510d5f701e866d964f Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 3042/3081] 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 af723bdf0f246f41598fa1a4c4d919d0157d3f6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3043/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 adc568bfe10576446b0bb5cf25b16e2432757f4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3044/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7fe4c748527d35243e35ae785081d41c224a86e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3045/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 08603599c894c8c2e7823e7a77bc5e22776086b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3046/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 dfaa03b11af690c05f5d4c719f0844c9da51088d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3047/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 1df61e664b07280b24f6a4f5407d28120386e19d Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 3048/3081] 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 9c71ef944b1a502447421d1586b6db42b45574e3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 3049/3081] 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 cbdeab25b857c96ffe1cf539a58fa2b2c81db55a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3050/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ac8df3cad37029dafcc468ad26b3558f1f73e2a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3051/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 cdf44b80854f11265bf0852e7af8fbad1e86feaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3052/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 23a0880c5ab3dcbe749394c5a92495d3e19d82a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3053/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bdac42491ecfc5464fd1d7c9e73dd3694b028d47 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 3054/3081] 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 ee7a6e2039d1d99c6d48ec493d0b8315c921b451 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3055/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 bbad5da1c72a0cf3c4c334a08e3cb1845c3e51fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3056/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 c15e53dbf1b03fb51abd0a6b419198a269d04dee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3057/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 38117688f43b071ebcf079dba1a643bfd932df5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3058/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 20d3c767469ad5e1898d1a14fa00d978ef6d114c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3059/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 07e5693e30c0e4b7dac062bc16a774b3d254fae0 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 3060/3081] 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 766aeae3855e89d4192f26d32c08c6446095b2b3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 3061/3081] 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 1c4ebb7dc52014915d9f4138091b6fd5b481527b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3062/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 80a04055b954edbb14006bf53c7eb284283e99ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3063/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 08ef98d7ceb72f4de4e9de1fa34023b501f1854d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3064/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 b09b562ba25039a992430b57445bfc3992305aa9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3065/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 18baca141c827198d12ad628e8bc5a02ed083b8e Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:26:36 -0700 Subject: [PATCH 3066/3081] 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 94b1656177779c53747fa5194f3d1ad26964790e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3067/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 d90286c3db8e8e429842462c19c0b38241ce51f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3068/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 aab28e4557f8f327ec143c8023678282268fb9de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3069/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 0d565e673ea82375784891fa2f65e80c16654459 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3070/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 ceb14b6bbfcad9cd90bb86acc19f8c3c312db008 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3071/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4780ef700ab4639c61a14dace15cb5cff2194bc3 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:24:27 -0700 Subject: [PATCH 3072/3081] 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 5e575e536a21687815a9682c02b847a58beefbd7 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Wed, 13 Jul 2022 08:25:38 -0700 Subject: [PATCH 3073/3081] 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 4dcca6144a496b4e8fa139f819cb19d93c25244f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3074/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 01aba36f3373689b638e425ad2259c0e953588ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3075/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 7a2b608797c3858f2e1992649036ed9d9bf50cb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3076/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 fd3b1c3ee2abe9ea1c990a611d7720a8144c51ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3077/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4b90b90f07decc984ec383301402f20fe74e7694 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3078/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 9ef94a78cffc021ab4c24c0f31ca27eee52d6cc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3079/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 4c7207335fdb30912b475609ce8c1b91c62ddd5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 02:20:44 +0000 Subject: [PATCH 3080/3081] Bump PSReadLine from 2.1.0 to 2.2.2 in /src/Modules Bumps PSReadLine from 2.1.0 to 2.2.2. --- 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 6569b7a81aafc12f788e998b20bf52881c986f59 Mon Sep 17 00:00:00 2001 From: PaulHigin Date: Tue, 17 Jan 2023 14:14:51 -0800 Subject: [PATCH 3081/3081] Allow debug hook with new API --- .../security/wldpNativeMethods.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs index 730db922a00..a2be725da73 100644 --- a/src/System.Management.Automation/security/wldpNativeMethods.cs +++ b/src/System.Management.Automation/security/wldpNativeMethods.cs @@ -110,9 +110,9 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement( { SafeHandle fileHandle = fileStream.SafeFileHandle; - // First check latest WDAC APIs if available. + // First check latest WDAC APIs if available. Also revert to legacy APIs if debug hook is in effect. Exception errorException = null; - if (s_wldpCanExecuteAvailable) + if (s_wldpCanExecuteAvailable && !s_allowDebugOverridePolicy) { try {