diff options
author | Gennadiy Civil <misterg@google.com> | 2018-01-26 16:57:58 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-01-26 16:57:58 (GMT) |
commit | fbb48a7708fc791ef25096b383791966bbf369f0 (patch) | |
tree | 06f49b8bef466973da1f715f658d9470af7aa263 /googlemock/include/gmock/gmock.h | |
parent | b3a2048beb0f8d6cbb2d5c95e7f639780eff5805 (diff) | |
download | googletest-fbb48a7708fc791ef25096b383791966bbf369f0.zip googletest-fbb48a7708fc791ef25096b383791966bbf369f0.tar.gz googletest-fbb48a7708fc791ef25096b383791966bbf369f0.tar.bz2 |
Code merges
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 5764bc8..6ccb118 100644 --- a/googlemock/include/gmock/gmock.h +++ b/googlemock/include/gmock/gmock.h @@ -59,8 +59,8 @@ #include "gmock/gmock-cardinalities.h" #include "gmock/gmock-generated-actions.h" #include "gmock/gmock-generated-function-mockers.h" -#include "gmock/gmock-generated-nice-strict.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" |