diff options
author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2019-01-04 03:13:20 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-04 03:13:20 (GMT) |
commit | 0ffa5f9779fc3a1b18d4931484b46825d952821d (patch) | |
tree | f31698c81378165e2fe639e93d6f54b252b1e2c2 /googlemock/include/gmock/gmock.h | |
parent | 0c0ca90382457859785a97bea5695093d72097dd (diff) | |
parent | 3880b13e4c0b04ca88f69b9c93da6058bd836c34 (diff) | |
download | googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.zip googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.gz googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.bz2 |
Merge branch 'master' into chore/fix_library_json
Diffstat (limited to 'googlemock/include/gmock/gmock.h')
-rw-r--r-- | googlemock/include/gmock/gmock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock.h b/googlemock/include/gmock/gmock.h index 14ad551..69ac0c1 100644 --- a/googlemock/include/gmock/gmock.h +++ b/googlemock/include/gmock/gmock.h @@ -62,10 +62,10 @@ #include "gmock/gmock-generated-actions.h" #include "gmock/gmock-generated-function-mockers.h" #include "gmock/gmock-generated-matchers.h" -#include "gmock/gmock-generated-nice-strict.h" #include "gmock/gmock-matchers.h" #include "gmock/gmock-more-actions.h" #include "gmock/gmock-more-matchers.h" +#include "gmock/gmock-nice-strict.h" #include "gmock/internal/gmock-internal-utils.h" namespace testing { |