diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-08-03 10:35:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-03 10:35:27 -0700 |
| commit | dedd8aec0d87e3d6df511a881ca15f51b3c8f487 (patch) | |
| tree | 5f16f1017d389ba06b9943feaa35e7faded09c71 | |
| parent | 8d8115bf524044f2ab5928d7b4050d04f64d3f1c (diff) | |
| parent | 3886860aa46f6b8b7013f77baf7daeed9b7647c3 (diff) | |
| download | protobuf-dedd8aec0d87e3d6df511a881ca15f51b3c8f487.tar.gz protobuf-dedd8aec0d87e3d6df511a881ca15f51b3c8f487.tar.bz2 protobuf-dedd8aec0d87e3d6df511a881ca15f51b3c8f487.zip | |
Merge pull request #1914 from adamatan/typo-fix
Typo: beffer -> buffer
| -rw-r--r-- | python/google/protobuf/json_format.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/json_format.py b/python/google/protobuf/json_format.py index bb6a1998..edc0cb50 100644 --- a/python/google/protobuf/json_format.py +++ b/python/google/protobuf/json_format.py @@ -310,7 +310,7 @@ def Parse(text, message, ignore_unknown_fields=False): Args: text: Message JSON representation. - message: A protocol beffer message to merge into. + message: A protocol buffer message to merge into. ignore_unknown_fields: If True, do not raise errors for unknown fields. Returns: |