diff options
| author |  Martin Wicke <martin.wicke@gmail.com> | 2017-11-10 12:26:11 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-10 12:26:11 -0800 |
| commit | d0a5d885d61b837018cb931a4d577289acc826fc (patch) | |
| tree | dd344e45c4eca857c02746ef50d990a9cd81ea69 /CODE_OF_CONDUCT.md | |
| parent | 047d7965d2877d7b55f4cdb0d0abdcd733f266a9 (diff) | |
Revert "Branch 175277161"
Diffstat (limited to 'CODE_OF_CONDUCT.md')
| -rw-r--r-- | CODE_OF_CONDUCT.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 10fd595fec..cfc45049f7 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -42,7 +42,7 @@ The Code of Conduct also applies within project spaces and in public spaces when Conflicts in an open source project can take many forms, from someone having a bad day and using harsh and hurtful language in the issue queue, to more serious instances such as sexist/racist statements or threats of violence, and everything in between. -If the behaviour is threatening or harassing, or for other reasons requires immediate escalation, please see below. +If the behavior is threatening or harassing, or for other reasons requires immediate escalation, please see below. However, for the vast majority of issues, we aim to empower individuals to first resolve conflicts themselves, asking for help when needed, and only after that fails to escalate further. This approach gives people more control over the outcome of their dispute. |