diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-05-29 15:15:09 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-05-29 15:15:09 -0700 |
| commit | f720bc5428562f9d08e4c96bb32187a7f9162514 (patch) | |
| tree | 89ab8a84d31f3fc5d5082ba842b9c1a8f5a37765 /tools/buildgen/bunch.py | |
| parent | b7bf14f51680d112af8276817c1ea6572c670fe5 (diff) | |
| parent | eaee2bcb32e203a9ae79e514f552f31e254d74f6 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into server_auth_context
Diffstat (limited to 'tools/buildgen/bunch.py')
| -rwxr-xr-x | tools/buildgen/bunch.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/buildgen/bunch.py b/tools/buildgen/bunch.py index 0db8792523..1f17ccb31b 100755 --- a/tools/buildgen/bunch.py +++ b/tools/buildgen/bunch.py @@ -57,6 +57,7 @@ def merge_json(dst, add): if isinstance(dst, dict) and isinstance(add, dict): for k, v in add.items(): if k in dst: + if k == '#': continue merge_json(dst[k], v) else: dst[k] = v |