aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock_output_test.py
diff options
context:
space:
mode:
authorTanzinul Islam <t_17_7@hotmail.com>2018-08-01 22:48:05 +0100
committerTanzinul Islam <t_17_7@hotmail.com>2018-08-01 22:48:05 +0100
commit1cd979a80701a6c8c370f3a69048ba5cbec62a28 (patch)
tree5358fa1f0e6726c0b9a77b985d26f7b431b663b9 /googlemock/test/gmock_output_test.py
parent3280099951c51b7d2745bd840f2dd9d967cffcda (diff)
parente5e2ef7cd27cc089c1d8302a11970ef870554294 (diff)
downloadgoogletest-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_output_test.py')
-rwxr-xr-xgooglemock/test/gmock_output_test.py1
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