Check for merge conflicts

Merge pull request #39 from DaedalusDock/master #147

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	4s
	4s