diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 10:35:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 10:35:56 -0400 |
| commit | 1dad4cf52123f52896d63c8fd103b6c84bf6ae7c (patch) | |
| tree | 85b7c60880416650d6006d4cdd09c2112d865596 /googlemock/test/gmock_link2_test.cc | |
| parent | 10f05a627c2da8d7de78da1b08f984ce8de398fb (diff) | |
| parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
| download | googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.gz googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.bz2 googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/googlemock/test/gmock_link2_test.cc b/googlemock/test/gmock_link2_test.cc index 4c310c3d..d27ce176 100644 --- a/googlemock/test/gmock_link2_test.cc +++ b/googlemock/test/gmock_link2_test.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev) + // Google Mock - a framework for writing C++ mock classes. // @@ -37,4 +36,4 @@ #define LinkTest LinkTest2 -#include "test/gmock_link_test.h" +#include "test/gmock_link_test.h" |