dejo-core/dejo-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve conflitos em CHANGELOG.md após merge de master

Browse Source
This commit is contained in:
andre.caetano
2025-06-11 21:12:43 -03:00
parent bb116a2780 771281d8af
commit 782ad9aadc
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -26,11 +26,14 @@
### Features ### Features
<<<<<<< HEAD
* Alteração trigger deploy branch master para dev ([15bb087](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/15bb0872f818e2a7868b87ee53ed8fbbeafa1322)) * Alteração trigger deploy branch master para dev ([15bb087](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/15bb0872f818e2a7868b87ee53ed8fbbeafa1322))
* Alteração trigger deploy branch master para dev ([1b2aaff](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/1b2aaff753dfd3da0ceb616446607ad4823676fe)) * Alteração trigger deploy branch master para dev ([1b2aaff](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/1b2aaff753dfd3da0ceb616446607ad4823676fe))
* Alteração trigger deploy branch master para dev ([772a1ac](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/772a1ac9e91200666e41211e2c264eb70e214b39)) * Alteração trigger deploy branch master para dev ([772a1ac](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/772a1ac9e91200666e41211e2c264eb70e214b39))
======= =======
>>>>>>> 4ef86c0 (chore(release): 1.0.0 [skip ci]) >>>>>>> 4ef86c0 (chore(release): 1.0.0 [skip ci])
=======
>>>>>>> master
* CI/CD - Conventional Commits e Semantic Release ([2c1f871](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/2c1f8715dde4084a08117bffae1bbc40e7b9a95c)) * CI/CD - Conventional Commits e Semantic Release ([2c1f871](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/2c1f8715dde4084a08117bffae1bbc40e7b9a95c))
* CI/CD - Conventional Commits e Semantic Release ([cc93db0](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/cc93db0d9a8e1358ca1e3e6128d1d710fc35e5b6)) * CI/CD - Conventional Commits e Semantic Release ([cc93db0](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/cc93db0d9a8e1358ca1e3e6128d1d710fc35e5b6))
* CI/CD - Conventional Commits e Semantic Release ([abf3c77](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/abf3c771e539afa48de8139ed7adb81341e80600)) * CI/CD - Conventional Commits e Semantic Release ([abf3c77](https://git.dejodigital.com.br/dejo-core/dejo-node/commit/abf3c771e539afa48de8139ed7adb81341e80600))