From: Dylan Baker Date: Thu, 5 Mar 2020 18:49:51 +0000 (-0800) Subject: docs/submittingpatches: Fix confusing typo + missing pronoun X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7451eb9a2773a2dcde90ddc93fb5ef361b6f1b1e;p=mesa.git docs/submittingpatches: Fix confusing typo + missing pronoun Reviewed-by: Eric Engestrom Part-of: --- 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.