Check for merge conflicts

Merge pull request #1588 from pi-hole/dev #815

Sign in to view logs

Summary
Jobs
- main
Run details
- Usage
- Workflow file

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
main	2m 2s
	2m 2s