Merge pull request #542 from GluuFederation/solve_merge_conflict

fix: solve merge conflict to 4.5.1
GluuFederation · Jun 5, 2023 · ab2b94d · ab2b94d
2 parents 53a5659 + 977f024
commit ab2b94d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -155,7 +155,7 @@ required at oxTrust.
 * **session:** ensure cookies settings are correct ([7c24b83](https://github.com/GluuFederation/gluu-passport/commit/7c24b835c0580aa3a09c16486edb9045d88eca36))
 * package.json & package-lock.json to reduce vulnerabilities ([218b7ce](https://github.com/GluuFederation/gluu-passport/commit/218b7cef7f8b2cf465d0b059246fabc3da4458e4))
 
-## [4.5.0](https://github.com/GluuFederation/gluu-passport/compare/v4.4.0...v4.5.0) (2021-03-30)
+## [4.5.1](https://github.com/GluuFederation/gluu-passport/compare/v4.4.0...v4.5.1) (2021-03-30)
 
 
 ### Features