aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/internal
diff options
context:
space:
mode:
authorGravatar Otto Kekäläinen <otto@seravo.fi>2016-07-03 15:26:04 +0300
committerGravatar Otto Kekäläinen <otto@seravo.fi>2016-07-03 15:26:04 +0300
commit3808d091f86e079c8f3437f5cd66bd2c507cef8a (patch)
tree83e72f0b4fb9548251fdb0af74003e1523251226 /python/google/protobuf/internal
parentcae3b0cbb689d0ed1e5da73942a5a9705f3411b0 (diff)
Fix spelling in strings and comments
Diffstat (limited to 'python/google/protobuf/internal')
-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.
"""