Module: Mesa Branch: master Commit: 7451eb9a2773a2dcde90ddc93fb5ef361b6f1b1e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7451eb9a2773a2dcde90ddc93fb5ef361b6f1b1e
Author: Dylan Baker <dy...@pnwbakers.com> Date: Thu Mar 5 10:49:51 2020 -0800 docs/submittingpatches: Fix confusing typo + missing pronoun Reviewed-by: Eric Engestrom <e...@engestrom.ch> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4066> --- docs/submittingpatches.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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. <p> 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. </p> <p> _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
