Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contributor_docs/preparing_a_pull_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Then ask git about the latest changes.
git status

## Pull Request Templates
Once you've opened your pull request, please ensure that you follow the guidelines and
Once you've opened your pull request, please ensure that you follow the guidelines.

## CONFLICTS
You may have some conflicts! It's okay. Feel free to ask for help. If merging with the latest upstream `develop` branch causes conflicts, you can always make a pull request with the upstream repository, which makes the merge conflicts public.
Expand Down