aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/internal/_parameterized.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/google/protobuf/internal/_parameterized.py')
-rwxr-xr-xpython/google/protobuf/internal/_parameterized.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/internal/_parameterized.py b/python/google/protobuf/internal/_parameterized.py
index dea3f199..23a78f03 100755
--- a/python/google/protobuf/internal/_parameterized.py
+++ b/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.
"""