Skip to content

Commit 251b8aa

Browse files
committed
Tidy up conflict res
Signed-off-by: Ricardo Zanini <[email protected]>
1 parent 38631a2 commit 251b8aa

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

GOVERNANCE.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,8 @@ document for more information about opening pull requests.
131131

132132
## Conflict Resolution
133133

134-
To merge changes into the specification, at least 66% approval from the project's maintainers is required.
135-
Maintainers who do not explicitly voice their opinions on the pull request within the two-day approval period are
136-
assumed to agree through [lazy consensus](http://communitymgt.wikia.com/wiki/Lazy_consensus).
134+
To merge changes into the specification, approval from at least one maintainer, other than the pull request's author, is required.
135+
Maintainers who do not explicitly voice their opinions on the pull request within the two-day approval period are assumed to agree through [lazy consensus](http://communitymgt.wikia.com/wiki/Lazy_consensus).
137136

138137
Discussions and voting can be posponed in case one of the maintainers expressed that
139138
they won't be available for personal reasons, e.g. parental leave, vacations, sick leave, etc.

0 commit comments

Comments
 (0)