summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2015-06-03 17:57:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-06-03 17:57:34 +0000
commitf0951c6e477ed25b2eccddf1e9c44b96268a6525 (patch)
tree1038c91b09d7c959498995be4ddb74c9937603de
parenta81cd83a6e4b2f0d0a4714c3becf277b8886c38f (diff)
downloadtrusty-f0951c6e477ed25b2eccddf1e9c44b96268a6525.tar.gz
Modified project settings
-rw-r--r--project.config5
1 files changed, 5 insertions, 0 deletions
diff --git a/project.config b/project.config
index 563d43e..bf7ed83 100644
--- a/project.config
+++ b/project.config
@@ -1,2 +1,7 @@
[access]
inheritFrom = All-Projects
+[receive]
+ requireContributorAgreement = true
+[submit]
+ action = merge always
+ mergeContent = true