resolved merge conflict

databricks · Oct 23, 2024 · 252f9cf · 252f9cf
2 parents 4bf4280 + 7e4b3d9
commit 252f9cf
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/scim/data_users.go b/scim/data_users.go
@@ -4,6 +4,10 @@ import (
 	"context"
 	"fmt"
 
+<<<<<<< HEAD
+=======
+	"github.com/databricks/databricks-sdk-go"
+>>>>>>> 7e4b3d96d571ea9f8ff140b2b53b8d53cfa5c5d3
 	"github.com/databricks/databricks-sdk-go/service/iam"
 	"github.com/databricks/terraform-provider-databricks/common"
 )
@@ -22,7 +26,11 @@ func DataSourceUsers() common.Resource {
 		Users               []UserInfo `json:"users,omitempty" tf:"computed"`
 	}
 
+<<<<<<< HEAD
 	return common.Data(func(ctx context.Context, data *DataUsers, c *common.DatabricksClient) error {
+=======
+	return common.AccountData(func(ctx context.Context, data *DataUsers, acc *databricks.AccountClient) error {
+>>>>>>> 7e4b3d96d571ea9f8ff140b2b53b8d53cfa5c5d3
 		listRequest := iam.ListAccountUsersRequest{
 			Attributes: "id,userName,displayName",
 		}