Update client.go

Signed-off-by: Corey Boornazian <coreyb220@gmail.com>
jaegertracing · Jul 25, 2018 · c8a12fa · c8a12fa
1 parent c043485
commit c8a12fa
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/examples/hotrod/services/route/client.go b/examples/hotrod/services/route/client.go
@@ -58,10 +58,6 @@ func (c *Client) FindRoute(ctx context.Context, pickup, dropoff string) (*Route,
 	v.Set("pickup", pickup)
 	v.Set("dropoff", dropoff)
 	url := "http://" + c.hostPort + "/route?" + v.Encode()
-<<<<<<< HEAD
-	fmt.Println(url)
-=======
->>>>>>> 5bd8fb70090dbe9d778b1bc12b4ce1bd4abe52dc
 	var route Route
 	if err := c.client.GetJSON(ctx, "/route", url, &route); err != nil {
 		c.logger.For(ctx).Error("Error getting route", zap.Error(err))