From 012fb1835c3fceb166f9b81f159e7e09a9af61de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Cie=C5=9Blak?= Date: Mon, 4 Nov 2024 12:22:30 +0100 Subject: [PATCH] Resolve merge conflicts --- pkg/resources/task_acceptance_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/resources/task_acceptance_test.go b/pkg/resources/task_acceptance_test.go index 58b29d5bf0..144f7b70bd 100644 --- 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"