summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING4
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING
index d826e8805f..c60596ebbe 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -57,8 +57,8 @@ the acceptance and review process faster:
3. Patches should be as current as possible. When using GitHub, please
expect to have to rebase and update often. Note that we do not accept merge
- commits, so please avoid these in any pull request. You will be asked to
- remove them before a patch is considered acceptable.
+ commits. You will be asked to remove them before a patch is considered
+ acceptable.
4. Patches should follow our coding style (see
https://www.openssl.org/policies/codingstyle.html) and compile without