resolve merge conflicts #742

Sign in to view logs

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
Lint	1m 14s
CHANGELOG.md updated	0s
Distributed-test-suite (3.7)	3m 41s
Distributed-test-suite (3.8)	3m 34s
Distributed-test-suite (3.9)	3m 31s
Distributed-test-suite (3.10)	3m 18s
Distributed-test-suite (3.11)	3m 35s
Local-test-suite (3.7)	7m 10s
Local-test-suite (3.8)	6m 0s
Local-test-suite (3.9)	6m 20s
Local-test-suite (3.10)	7m 18s
Local-test-suite (3.11)	5m 36s
	51m 17s