diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-26 12:22:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 12:22:48 -0500 |
| commit | 718fd88d8f145c63b8cc134cf8fed92743cc112f (patch) | |
| tree | 2a2f28e60798824956dc46fb7c89e1e35ee2a8de /googlemock/include/gmock/gmock.h | |
| parent | cb7271697bca56802db773f1b9a92fdaed5b7eee (diff) | |
| parent | 92c93802e13e84f4d916f45dd99417cdeb38841b (diff) | |
| download | googletest-718fd88d8f145c63b8cc134cf8fed92743cc112f.tar.gz googletest-718fd88d8f145c63b8cc134cf8fed92743cc112f.tar.bz2 googletest-718fd88d8f145c63b8cc134cf8fed92743cc112f.zip | |
Merge pull request #1429 from gennadiycivil/master
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 5764bc85..6ccb118b 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" |