[skip travis] Add "avoid merge conflicts"

This commit is contained in:
Clement Tsang 2020-02-29 19:37:49 -05:00 committed by GitHub
parent 27a04b9dd5
commit b991102819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -29,6 +29,7 @@ _Please ensure all are ticked (and actually done):_
- [ ] Code has been self-reviewed
- [ ] Code has been tested and no new breakage is introduced
- [ ] Documentation has been added/updated if needed
- [ ] No merge conflicts arise from the change
## Other information