diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html index 9113e417009..7378dda6b83 100644 --- a/docs/submittingpatches.html +++ b/docs/submittingpatches.html @@ -386,7 +386,8 @@ yourself warned.

By default merge conflicts are resolved by the stable-release manager. The release maintainer should resolve trivial conflicts, but for complex conflicts -should ask the original author to provide a backport of de-nominate. +they should ask the original author to provide a backport or de-nominate the +patch.