diff options
author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-01 22:48:05 +0100 |
---|---|---|
committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-01 22:48:05 +0100 |
commit | 1cd979a80701a6c8c370f3a69048ba5cbec62a28 (patch) | |
tree | 5358fa1f0e6726c0b9a77b985d26f7b431b663b9 /googlemock/test/gmock_link2_test.cc | |
parent | 3280099951c51b7d2745bd840f2dd9d967cffcda (diff) | |
parent | e5e2ef7cd27cc089c1d8302a11970ef870554294 (diff) | |
download | googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.tar.gz googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.tar.bz2 googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.zip |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/test/gmock_link2_test.cc')
-rw-r--r-- | googlemock/test/gmock_link2_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock_link2_test.cc b/googlemock/test/gmock_link2_test.cc index 4c310c3d..2b48395c 100644 --- a/googlemock/test/gmock_link2_test.cc +++ b/googlemock/test/gmock_link2_test.cc @@ -37,4 +37,4 @@ #define LinkTest LinkTest2 -#include "test/gmock_link_test.h" +#include "test/gmock_link_test.h" |