commit 5c28096ce3b6e5fe0564d836ba69347f5f97dc02
author Mark D. Roth <roth@google.com> Fri Sep 16 13:23:58 2016 -0700
committer Mark D. Roth <roth@google.com> Fri Sep 16 13:23:58 2016 -0700
tree 5dff5f1b8477b2f5f786bcb02a9ec552f9358d55
parent 8b7678cf846cc5b51cd4fc459c7a8d7a2aaebc01

Fix merge problems.

src/core/ext/client_config/http_connect_handshaker.c

diff --git a/src/core/ext/client_config/http_connect_handshaker.c b/src/core/ext/client_config/http_connect_handshaker.c
index b6d71e2..fda1df1 100644
--- a/src/core/ext/client_config/http_connect_handshaker.c
+++ b/src/core/ext/client_config/http_connect_handshaker.c
@@ -35,9 +35,9 @@
 
 #include <string.h>
 
-#include <grpc/impl/codegen/alloc.h>
-#include <grpc/impl/codegen/log.h>
-#include <grpc/impl/codegen/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/slice_buffer.h>
 #include <grpc/support/string_util.h>
 
 #include "src/core/ext/client_config/uri_parser.h"