Skip to content

Commit

Permalink
Update the readme for integrated fix okta#50 and new fix for okta#61
Browse files Browse the repository at this point in the history
  • Loading branch information
TriggerAu committed Nov 1, 2024
1 parent ac005a6 commit 84f9e5f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
> ### Integrated Fixes
>The below are the open PRs at the source integrated here, but not yet at the source
> * [Add check of IsValueType to prevent Stack Overflow (#43)](https://github.com/okta/okta-powershell-cli/pull/49)
> * [Add forced casting for Arrays in Remove-NullProperties (#50)](https://github.com/okta/okta-powershell-cli/pull/51)
> * [Fix for ApiKey configuration fields not working for the API functions (#52)](https://github.com/okta/okta-powershell-cli/pull/53)
> * [Fixes the logic for Parameter existence to use PSBoundParameters.ContainsKey() (#56)](https://github.com/okta/okta-powershell-cli/pull/57)
> * [RateLimiting functionality does not work (#61)](https://github.com/okta/okta-powershell-cli/pull/62)
---
# Okta.PowerShell - The PowerShell module for the Okta Management API
Expand Down
8 changes: 0 additions & 8 deletions src/Okta.PowerShell/Okta.PowerShell.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
#
# Generated by: Okta, Inc.
#
<<<<<<< HEAD
# Generated on: 28/09/2024
=======
# Generated on: 2024-10-29
>>>>>>> main
#

@{
Expand All @@ -22,11 +18,7 @@ ModuleVersion = '1.0.3'
CompatiblePSEditions = 'Core'

# ID used to uniquely identify this module
<<<<<<< HEAD
GUID = '177b1c41-81a8-4465-aa26-750014289fbf'
=======
GUID = '5e82b81c-92d5-47bc-a10f-e26b40081903'
>>>>>>> main

# Author of this module
Author = 'Okta, Inc.'
Expand Down

0 comments on commit 84f9e5f

Please sign in to comment.