diff options
author | tisi1988 <tisi1988@gmail.com> | 2018-08-07 11:12:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-07 11:12:00 +0200 |
commit | e9b05a4d6aa7f471cbb1bd30c3b9792c939de127 (patch) | |
tree | f38bcb2d7e6ae7353fa09aae5ba59cc3019ae1e8 /googlemock/test/gmock_output_test.py | |
parent | 25e1436b087ac2b05a4b5eeb0a2704a53016be2d (diff) | |
parent | 28b71e444c41ad93225145e029db4957f15aaae6 (diff) | |
download | googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.tar.gz googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.tar.bz2 googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.zip |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/test/gmock_output_test.py')
-rwxr-xr-x | googlemock/test/gmock_output_test.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py index 9d73d570..8f57d46c 100755 --- a/googlemock/test/gmock_output_test.py +++ b/googlemock/test/gmock_output_test.py @@ -43,7 +43,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import os import re import sys - import gmock_test_utils |