aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-14 15:29:51 -0700
committerGitHub <noreply@github.com>2017-08-14 15:29:51 -0700
commit08b1a1f73cec48481ec3e477e8c247e7aa534df5 (patch)
tree7d9b6428b2661baf08c8e50bbd9fa2eac6b54816 /googlemock/src
parent3f3a3ada2022a8b4255b408ef5d2ab439e987c08 (diff)
parente0fc65c5fbfe4e50a0369d032e9b2811b4b7db77 (diff)
downloadgoogletest-08b1a1f73cec48481ec3e477e8c247e7aa534df5.tar.gz
googletest-08b1a1f73cec48481ec3e477e8c247e7aa534df5.tar.bz2
googletest-08b1a1f73cec48481ec3e477e8c247e7aa534df5.zip
Merge branch 'master' into master
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock-matchers.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/src/gmock-matchers.cc b/googlemock/src/gmock-matchers.cc
index e0de25cb..6e40e5e8 100644
--- a/googlemock/src/gmock-matchers.cc
+++ b/googlemock/src/gmock-matchers.cc
@@ -288,7 +288,7 @@ class MaxBipartiteMatchState {
// Each element of the left_ vector represents a left hand side node
// (i.e. an element) and each element of right_ is a right hand side
// node (i.e. a matcher). The values in the left_ vector indicate
- // outflow from that node to a node on the the right_ side. The values
+ // outflow from that node to a node on the right_ side. The values
// in the right_ indicate inflow, and specify which left_ node is
// feeding that right_ node, if any. For example, left_[3] == 1 means
// there's a flow from element #3 to matcher #1. Such a flow would also