fix a conflict

7 years ago · 5122487fad
parent 18b9133f31
commit 5122487fad
1 changed files with 0 additions and 5 deletions
--- 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__)