Francisco f03420b5c7 Remove automatic conflict resolution for merge from release branch (#4362) ...

(cherry picked from commit 002a7c8812)

2023-06-16 15:43:14 -03:00

..

actionlint.yml

…

changeset.yml

…

checks.yml

…

docs.yml

…

formal-verification.yml

…

release-cycle.yml

…

upgradeable.yml

…