📖 Changelog

changelog.md

@@ -23,12 +23,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - #25 [Ticket] add: regenerate qr code and also fix bug of document generation [`81dd0b3`](https://github.com/Evarisk/gmao/commit/81dd0b3ea61dad6a008f09d1009f9f6456275800)
 - 📖 Changelog [`38f6e62`](https://github.com/Evarisk/gmao/commit/38f6e6232cbfd2f7ecb2b2af73c6d4144ea7a36d)
 - #20 [ODT] add: special ticket [`a61b6c6`](https://github.com/Evarisk/gmao/commit/a61b6c6ae147519c8514a22c5a5e7a33e68d76ed)
+- 📖 Changelog [`c681f84`](https://github.com/Evarisk/gmao/commit/c681f84aeb839e47727382f4706d4a492a5f3295)
 - #20 [Hook] fix: clean check on email thirdparty [`e41cec4`](https://github.com/Evarisk/gmao/commit/e41cec4cb5d259da3336d2cb81a1ec71ca9a51fe)
 - #35 [Hook] fix: PSR 12 [`b77ae94`](https://github.com/Evarisk/gmao/commit/b77ae94e114ceae291d6dafd2094aa86ebaf6765)
 - #20 [ODT] add: remove_file in gmao [`652eeca`](https://github.com/Evarisk/gmao/commit/652eecac73643fa03fa6921c1c633110f7bb78f9)
 - #25 [Ticket] fix: missing check on action generate_qrcode [`5f04b10`](https://github.com/Evarisk/gmao/commit/5f04b106b0bb8b7aa1334924bf2c2599fcdd212a)
 - #20 [Hook] : fix email position [`bd6479b`](https://github.com/Evarisk/gmao/commit/bd6479bd82c2b630bd7704afd14548bb9dcb5f15)
 - #28 [Hook] fix: typage dolibarr 20 [`103014a`](https://github.com/Evarisk/gmao/commit/103014aebcfab121d494f0b11d8d29ecdb514b52)
+- #18 [ODT] fix: key for website merge conflit issue [`7eeb558`](https://github.com/Evarisk/gmao/commit/7eeb55884ac46f2edbbb6619175030920b87db19)
 - #27 [Mod] fix: change color in red instead of blue [`3c0107c`](https://github.com/Evarisk/gmao/commit/3c0107cd5978ae06dcb65be5da765b9c4aa0842d)
 - #27 [Mod] add: picto [`61c218d`](https://github.com/Evarisk/gmao/commit/61c218df48c7ea90e193ee433dfcef234c27d035)
 - #18 [ODT] fix: key for website [`acf891d`](https://github.com/Evarisk/gmao/commit/acf891dfe96eab9912037db4c3f5970adc62753b)