Merge pull request #9841 from hashicorp/dnephin/fix-merge-conflict

[1.9.x ]Fix merge conflict
hashicorp · Mar 2, 2021 · b1b235b · b1b235b
2 parents dd0b307 + a10dded
commit b1b235b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/agent/health_endpoint_test.go b/agent/health_endpoint_test.go
@@ -8,6 +8,7 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"reflect"
+	"strconv"
 	"testing"
 	"time"
 

diff --git a/agent/testagent.go b/agent/testagent.go
@@ -16,7 +16,6 @@ import (
 	"time"
 
 	metrics "github.com/armon/go-metrics"
-	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/go-hclog"
 	uuid "github.com/hashicorp/go-uuid"