| Index: third_party/protobuf/python/google/protobuf/internal/_parameterized.py
|
| diff --git a/third_party/protobuf/python/google/protobuf/internal/_parameterized.py b/third_party/protobuf/python/google/protobuf/internal/_parameterized.py
|
| index dea3f19975d03009f028006fdb2abd0fdf10242b..23a78f037e20dc65f3ab6b3ef5a7b7d1ea246a2c 100755
|
| --- a/third_party/protobuf/python/google/protobuf/internal/_parameterized.py
|
| +++ b/third_party/protobuf/python/google/protobuf/internal/_parameterized.py
|
| @@ -347,7 +347,7 @@ class TestGeneratorMetaclass(type):
|
| iterable conforms to the test pattern, the injected methods will be picked
|
| up as tests by the unittest framework.
|
|
|
| - In general, it is supposed to be used in conjuction with the
|
| + In general, it is supposed to be used in conjunction with the
|
| Parameters decorator.
|
| """
|
|
|
|
|