fix merge

databricks · Feb 21, 2024 · 2e385e8 · 2e385e8
1 parent a4d3ca5
commit 2e385e8
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/catalog/resource_connection.go b/catalog/resource_connection.go
@@ -120,13 +120,8 @@ func ResourceConnection() common.Resource {
 
 			if d.HasChange("owner") {
 				_, err = w.Connections.Update(ctx, catalog.UpdateConnection{
-<<<<<<< HEAD
-					NameArg: updateConnectionRequest.NameArg,
-					Owner:   updateConnectionRequest.Owner,
-=======
 					Name:  updateConnectionRequest.Name,
 					Owner: updateConnectionRequest.Owner,
->>>>>>> main
 				})
 				if err != nil {
 					return err
@@ -140,13 +135,8 @@ func ResourceConnection() common.Resource {
 					// Rollback
 					old, new := d.GetChange("owner")
 					_, rollbackErr := w.Connections.Update(ctx, catalog.UpdateConnection{
-<<<<<<< HEAD
-						NameArg: updateConnectionRequest.NameArg,
-						Owner:   old.(string),
-=======
 						Name:  updateConnectionRequest.Name,
 						Owner: old.(string),
->>>>>>> main
 					})
 					if rollbackErr != nil {
 						return common.OwnerRollbackError(err, rollbackErr, old.(string), new.(string))