aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-01-10 16:49:20 -0500
committerGennadiy Civil <misterg@google.com>2018-01-10 16:49:20 -0500
commit1d757db65cd12679c2d2213aa3430809b6566ef2 (patch)
treea515c7742577192e3bcf7c01fe2c843f00d3b510
parentb44ed2190507e7d926ffe1715a187c8c061b8bec (diff)
downloadgoogletest-1d757db65cd12679c2d2213aa3430809b6566ef2.tar.gz
googletest-1d757db65cd12679c2d2213aa3430809b6566ef2.tar.bz2
googletest-1d757db65cd12679c2d2213aa3430809b6566ef2.zip
More merge, cleanup
-rw-r--r--googletest/include/gtest/gtest-message.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest-message.h b/googletest/include/gtest/gtest-message.h
index fed61527..8bc28d28 100644
--- a/googletest/include/gtest/gtest-message.h
+++ b/googletest/include/gtest/gtest-message.h
@@ -113,7 +113,7 @@ class GTEST_API_ Message {
// Streams a non-pointer value to this object.
template <typename T>
inline Message& operator <<(const T& val) {
- // Some libraries overloads << for STL containers. These
+ // Some libraries overload << for STL containers. These
// overloads are defined in the global namespace instead of ::std.
//
// C++'s symbol lookup rule (i.e. Koenig lookup) says that these