Fix merge conflicts #315
main.yaml
on: push
validate
34s
deploy-dev
/
deploy
5m 40s
deploy-ampad
/
deploy