square away the stuff that hasn't been merged in a manual review

This fixes up ab8f346b (a manual merge) that has abandoned some things from PR #2395.
2019-09-07 06:08:28 +02:00
parent f2fb48c3b3
commit 7c2bd3af98
3 changed files with 2 additions and 5 deletions
--- a/googlemock/test/gmock-internal-utils_test.cc
+++ b/googlemock/test/gmock-internal-utils_test.cc
@@ -40,7 +40,6 @@
 #include <memory>
 #include <sstream>
 #include <string>
-#include <type_traits>
 #include <vector>

 #include "gmock/gmock.h"