diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-10-14 09:52:29 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-10-14 09:53:22 +0200 |
| commit | 03dd707dc027fbf6f24120213f8eb66571600374 (patch) | |
| tree | 1cdb1262d476d1bf3984191b0324091914342302 | |
| parent | e2b8c394d61de1e153b9b39d99c45654774f00de (diff) | |
| parent | 36f60a5d5b1bc9a12b87d6475e3245b8236775e4 (diff) | |
| download | bitcoin-03dd707dc027fbf6f24120213f8eb66571600374.tar.xz | |
Merge #8915: Add copyright/patent issues to possible NACK reasons
36f60a5 Add copyright/patent issues to possible NACK reasons (Peter Todd)
| -rw-r--r-- | CONTRIBUTING.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fd1a912c4f..06fcd8dd81 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -178,7 +178,9 @@ language is used within pull-request comments: - ACK means "I have tested the code and I agree it should be merged"; - NACK means "I disagree this should be merged", and must be accompanied by - sound technical justification. NACKs without accompanying reasoning may be disregarded; + sound technical justification (or in certain cases of copyright/patent/licensing + issues, legal justification). NACKs without accompanying reasoning may be + disregarded; - utACK means "I have not tested the code, but I have reviewed it and it looks OK, I agree it can be merged"; - Concept ACK means "I agree in the general principle of this pull request"; |