diff options
author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2019-08-27 18:00:04 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-27 18:00:04 -0500 |
commit | 85f059f03d56ce82cf8f68cf7505b695a0c730c2 (patch) | |
tree | e715b911578e831d7a3fdf46bbf2bdbece4fafc3 /googlemock/test/gmock_all_test.cc | |
parent | 130e5aa86a7a71501cf8fa7cd6f507928f01bd79 (diff) | |
parent | fdd6a1dc8c74bf37211c14a1b2e4b64755bb3380 (diff) | |
download | googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.gz googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.bz2 googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.zip |
Merge pull request #3 from google/master
Update master
Diffstat (limited to 'googlemock/test/gmock_all_test.cc')
-rw-r--r-- | googlemock/test/gmock_all_test.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/googlemock/test/gmock_all_test.cc b/googlemock/test/gmock_all_test.cc index e1774fbb..b2b2027d 100644 --- a/googlemock/test/gmock_all_test.cc +++ b/googlemock/test/gmock_all_test.cc @@ -39,7 +39,6 @@ #include "test/gmock-cardinalities_test.cc" #include "test/gmock-generated-actions_test.cc" #include "test/gmock-generated-function-mockers_test.cc" -#include "test/gmock-generated-internal-utils_test.cc" #include "test/gmock-generated-matchers_test.cc" #include "test/gmock-internal-utils_test.cc" #include "test/gmock-matchers_test.cc" |