diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-05-12 21:10:55 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-05-12 21:10:55 +0200 |
| commit | 0885f988632ca4f6a9adb99fe769cb019ca67ed0 (patch) | |
| tree | f5ecf0df112445238bda0f16177eb31ba3ad57e0 /test/cpp/end2end/mock_test.cc | |
| parent | b935a68386c4f8dba8318248f1f8b2f5751507fc (diff) | |
Fixing mock test target.
Diffstat (limited to 'test/cpp/end2end/mock_test.cc')
| -rw-r--r-- | test/cpp/end2end/mock_test.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc index b28afad7d7..3a82b3a5d6 100644 --- a/test/cpp/end2end/mock_test.cc +++ b/test/cpp/end2end/mock_test.cc @@ -59,7 +59,6 @@ #include <iostream> using namespace std; ->>>>>>> 45b89fb11ca3cd524787aeba7a1270f744a1256c using grpc::testing::EchoRequest; using grpc::testing::EchoResponse; using grpc::testing::EchoTestService; |