add

Author: SevenEarth

tencentcloud/services/crs/data_source_tc_redis_clusters.go

@@ -2,6 +2,7 @@ package crs
 
 import (
 	"context"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"

tencentcloud/services/crs/data_source_tc_redis_clusters_test.go

@@ -1,9 +1,10 @@
 package crs_test
 
 import (
+	"testing"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
-	"testing"
 )
 
 // go test -i; go test -test.run TestAccTencentCloudNeedFixRedisClustersDataSource_basic -v

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

@@ -1160,11 +1160,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
 ## explicit; go 1.14
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
-<<<<<<< HEAD
 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.978
-=======
-# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.976
->>>>>>> bcf5d13d7 (add)
 ## explicit; go 1.11
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors