From 4fd85d521b15da2c57d695f1237de4fde19dbf16 Mon Sep 17 00:00:00 2001
From: Luke Latham <1622880+guardrex@users.noreply.github.com>
Date: Wed, 28 Aug 2019 11:09:20 -0500
Subject: [PATCH] Update troubleshoot.md

---
 aspnetcore/grpc/troubleshoot.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/aspnetcore/grpc/troubleshoot.md b/aspnetcore/grpc/troubleshoot.md
index 7daa76e6d4..bf0c864088 100644
--- a/aspnetcore/grpc/troubleshoot.md
+++ b/aspnetcore/grpc/troubleshoot.md
@@ -74,16 +74,9 @@ Additional configuration is required to call insecure gRPC services with the .NE
 // This switch must be set before creating the GrpcChannel/HttpClient.
 AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
 
-<<<<<<< HEAD
-var httpClient = new HttpClient();
-// The address starts with "http://"
-httpClient.BaseAddress = new Uri("http://localhost:5000");
-var client = GrpcClient.Create<Greeter.GreeterClient>(httpClient);
-=======
 // The port number(5000) must match the port of the gRPC server.
 var channel = GrpcChannel.ForAddress("https://localhost:5001");
 var client = new Greet.GreeterClient(channel);
->>>>>>> Add gRPC client, client factory documentation, preview 9 react (#13684)
 ```
 
 ## Unable to start ASP.NET Core gRPC app on macOS