diff options
| author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-02-29 19:37:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 19:37:49 -0500 |
| commit | b9911028190190f6fe0a7905107cddf1d910a216 (patch) | |
| tree | abd0796a4c30f922570a26b92e6377d065f9654c /.github | |
| parent | 27a04b9dd532e8bad39ca9e3688455d2c33a4bc3 (diff) | |
[skip travis] Add "avoid merge conflicts"
Diffstat (limited to '.github')
| -rw-r--r-- | .github/pull_request_template.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 0f4b7955..d25908ef 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -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 |