diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-03 12:05:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-03 12:05:07 -0400 |
commit | 61f949387e1bb1cad4bf551f291d861214fb251c (patch) | |
tree | 3e85511dcf48820748441c079c57644ac51be4d9 /googlemock/test/gmock_output_test.py | |
parent | 6269264dfec89ebcbcdd1b9e38f2b44277c903b6 (diff) | |
parent | e887b03e5a1f6095a2cd08c28db8a63d4c016231 (diff) | |
download | googletest-61f949387e1bb1cad4bf551f291d861214fb251c.tar.gz googletest-61f949387e1bb1cad4bf551f291d861214fb251c.tar.bz2 googletest-61f949387e1bb1cad4bf551f291d861214fb251c.zip |
Merge branch 'master' into deprecate
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 |