diff options
| author |  yang-g <yangg@google.com> | 2016-06-03 15:34:01 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-06-03 15:34:01 -0700 |
| commit | aaee544d69ad53f5b173e9602fa191201c8f52e0 (patch) | |
| tree | 9c5e2e2d98a4ba6000f63ee0d48f84b2e1457b3e /test/cpp/qps/driver.cc | |
| parent | 17487f9a22bd57fa05a0b4196bbb19f62ef7eb6c (diff) | |
| parent | 84f71932eaf8b601355189896fc5b91449ac82d2 (diff) | |
merge and resolve conflicts
Diffstat (limited to 'test/cpp/qps/driver.cc')
| -rw-r--r-- | test/cpp/qps/driver.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index 04b2b453f9..57d8c22a95 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -43,7 +43,6 @@ #include <grpc/support/alloc.h> #include <grpc/support/host_port.h> #include <grpc/support/log.h> -#include <gtest/gtest.h> #include "src/core/lib/support/env.h" #include "src/proto/grpc/testing/services.grpc.pb.h" |