fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-20 10:00:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

docs/submittingpatches: Fix confusing typo + missing pronoun

Browse source 
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4066>
This commit is contained in:
Dylan Baker 2020-03-05 10:49:51 -08:00 • committed by Marge Bot
parent 42a3d821cb
commit 7451eb9a27
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/submittingpatches.html
View file

@ -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>