Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: third_party/protobuf/python/google/protobuf/internal/_parameterized.py

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Make chrome settings proto generated file a component Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
"""

Powered by Google App Engine
This is Rietveld 408576698