Resolve merge conflicts

Snowflake-Labs · Nov 4, 2024 · 012fb18 · 012fb18
1 parent 90404b9
commit 012fb18
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/resources/task_acceptance_test.go b/pkg/resources/task_acceptance_test.go
@@ -2,11 +2,12 @@ package resources_test
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"regexp"
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
+
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectparametersassert"