merged conflicts

CHANGELOG.md

@@ -4,7 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [v1.0.4](https://github.com/pagopa/io-functions-cgn-merchant/compare/v1.0.3...v1.0.4)
+#### [v1.0.5](https://github.com/pagopa/io-functions-cgn-merchant/compare/v1.0.4...v1.0.5)
+
+- Merge pull request #36 from pagopa/iopid-122 [`de08c18`](https://github.com/pagopa/io-functions-cgn-merchant/commit/de08c18861626822f19545dc09effb3bd18c72a4)
+- removed danger [`df03338`](https://github.com/pagopa/io-functions-cgn-merchant/commit/df03338daf40a8872423ff05e353285fda99c6a1)
+- updated redis client [`87fd9d6`](https://github.com/pagopa/io-functions-cgn-merchant/commit/87fd9d67a390cc84822c09fca2777eb0c0630675)
+
+#### [v1.0.4](https://github.com/pagopa/io-functions-cgn-merchant/compare/v1.0.4-RELEASE...v1.0.4)
+
+> 15 December 2022
+
+#### [v1.0.4-RELEASE](https://github.com/pagopa/io-functions-cgn-merchant/compare/v1.0.3...v1.0.4-RELEASE)
+
+> 15 December 2022
+
+- Bump version to 1.0.4 [skip ci] [`7732ecf`](https://github.com/pagopa/io-functions-cgn-merchant/commit/7732ecfe2f3ccee42aea858492b808fbe440579f)
 
 #### [v1.0.3](https://github.com/pagopa/io-functions-cgn-merchant/compare/v1.0.3-RELEASE...v1.0.3)
 

package.json

@@ -3,7 +3,7 @@
   "description": "",
   "author": "IO team",
   "repository": "https://github.com/pagopa/io-functions-cgn-merchant",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "license": "MIT",
   "scripts": {
     "prebuild": "shx rm -rf dist && yarn generate",