Merge branch 'master' into suppressDefault

2018-08-07 07:39:31 -07:00
parent 886a74769e 6f168c1f82
commit 252dc32f96
1 changed files with 0 additions and 2 deletions
--- a/googlemock/test/gmock-actions_test.cc
+++ b/googlemock/test/gmock-actions_test.cc
@@ -937,8 +937,6 @@ class Foo {
  int value_;
 };

-//  GOOGLETEST_CM0005 DO NOT DELETE
-
 // Tests InvokeWithoutArgs(function).
 TEST(InvokeWithoutArgsTest, Function) {
  // As an action that takes one argument.