diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-08 12:32:34 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-08 12:32:34 -0800 |
| commit | 5122487fad891fdf5560122285c1690a06df73d2 (patch) | |
| tree | f1be3cbbfac800599a704b9192e1bcd4e0fed1c1 /test/core/util | |
| parent | 18b9133f31e394ea81c6ae5a44efe802904b3140 (diff) | |
fix a conflict
Diffstat (limited to 'test/core/util')
| -rw-r--r-- | test/core/util/cmdline_test.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/test/core/util/cmdline_test.cc b/test/core/util/cmdline_test.cc index 069e1ceccf..9f5ad88d57 100644 --- a/test/core/util/cmdline_test.cc +++ b/test/core/util/cmdline_test.cc @@ -20,14 +20,9 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> -<<<<<<< HEAD:test/core/gpr/cmdline_test.cc #include "src/core/lib/gpr/useful.h" -======= -#include <grpc/support/useful.h> - #include "test/core/util/cmdline.h" ->>>>>>> master:test/core/util/cmdline_test.cc #include "test/core/util/test_config.h" #define LOG_TEST() gpr_log(GPR_INFO, "test at %s:%d", __FILE__, __LINE__) |