2 commits

Author	SHA1	Message	Date
Bill Thornton	158e435144	Prevent merge conflicts action from running on forks	2020-12-02 12:10:10 -05:00
Bill Thornton	fe3bd2e35d	Add github action to label PRs with merge conflicts	2020-12-01 10:01:56 -05:00