OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
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> <p>
By default merge conflicts are resolved by the stable-release manager. The By default merge conflicts are resolved by the stable-release manager. The
release maintainer should resolve trivial conflicts, but for complex conflicts 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>
<p> <p>